From: Wolfram Schneider <wosch@indexdata.dk>
Date: Fri, 14 Nov 2014 12:53:22 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=af62cf5634a1dd753f7031399a2a20549a140ecf;hp=840818e037f260581b45e5e4a90742d59a34ca87;p=irspy-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/irspy

Conflicts:
	zebra/zebra.cfg
---

diff --git a/zebra/README b/zebra/README
index af38aa6..6d3aa46 100644
--- a/zebra/README
+++ b/zebra/README
@@ -106,7 +106,7 @@ or:
 tar xzf records-2007-04-18.tar.gz
 zebraidx-2.0 init
 zebraidx-2.0 update zeerex.xml
-zebraidx-2.0 update records-2010-04-06
+zebraidx-2.0 update records-2013-08-13
 zebraidx-2.0 commit
 
 zebrasrv-2.0 -f yazserver.xml
diff --git a/zebra/zebra.cfg b/zebra/zebra.cfg
index f769105..7c7d482 100644
--- a/zebra/zebra.cfg
+++ b/zebra/zebra.cfg
@@ -1,6 +1,6 @@
 
 # Where to look for config files
-profilePath: .:/usr/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab:/opt/local/share/idzebra-2.0/tab:/usr/share/idzebra-2.0/tab
+profilePath: .:/usr/share/idzebra-2.0/tab:/opt/local/share/idzebra-2.0/tab:/usr/local/Cellar/zebra/2.0.59/share/idzebra-2.0/tab
 
 # Where to look for loadable zebra modules.  Both these path components
 # are necessary, since the former is used when installed from a Debian