From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 16 Jun 2011 12:48:39 +0000 (+0200)
Subject: Merge branch 'master' into zoom_filter
X-Git-Tag: v1.2.7~15^2
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=5a2903cdfd78fad9b3e5f8ebcd473356697650ef;p=metaproxy-moved-to-github.git

Merge branch 'master' into zoom_filter

Conflicts:
	src/filter_zoom.cpp
---

5a2903cdfd78fad9b3e5f8ebcd473356697650ef
diff --cc src/filter_zoom.cpp
index 7c88dd9,01a3a5e..da0f017
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@@ -29,7 -29,9 +29,10 @@@ Foundation, Inc., 51 Franklin St, Fift
  
  #include <boost/thread/mutex.hpp>
  #include <boost/thread/condition.hpp>
 +#include <yaz/ccl_xml.h>
+ #include <yaz/ccl.h>
+ #include <yaz/rpn2cql.h>
+ #include <yaz/pquery.h>
  #include <yaz/cql.h>
  #include <yaz/oid_db.h>
  #include <yaz/diagbib1.h>