From: Dennis Schafroth <dennis@indexdata.com>
Date: Thu, 19 Aug 2010 08:25:18 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
X-Git-Tag: v4.1.0~40
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=1ab314f533e2942e0898ad5fda346a48312b351a;p=yaz-moved-to-github.git

Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yaz
---

1ab314f533e2942e0898ad5fda346a48312b351a
diff --cc .cproject
index d3926f3,766f365..2b699b9
--- a/.cproject
+++ b/.cproject
@@@ -112,10 -111,7 +111,8 @@@
  						<entry excluding="*.lo|*.o" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
  						<entry excluding="*.o|*.lo" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="util"/>
  						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="client"/>
- 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
- 						<entry excluding="*.lo|*.o" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="zoom"/>
  						<entry excluding="*.o|*.lo" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="test"/>
 +						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="zoom"/>
  					</sourceEntries>
  				</configuration>
  			</storageModule>