From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 9 May 2012 10:58:36 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
X-Git-Tag: v1.3.35~4
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=1158dc8bbcb0bd5d161333380fe91e93185674a6;hp=4c528bfa11ac8640b5bf8f7018d0d096d30081df;p=metaproxy-moved-to-github.git

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

Conflicts:
	src/metaproxy_prog.cpp
---

diff --git a/src/filter_zoom.cpp b/src/filter_zoom.cpp
index 481ad35..a75c4d4 100644
--- a/src/filter_zoom.cpp
+++ b/src/filter_zoom.cpp
@@ -1444,7 +1444,7 @@ void yf::Zoom::Frontend::prepare_elements(BackendPtr b,
 }
 
 Z_Records *yf::Zoom::Frontend::get_explain_records(
-    Package &package,
+    mp::Package &package,
     Odr_int start,
     Odr_int number_to_present,
     int *error,
@@ -1503,7 +1503,7 @@ Z_Records *yf::Zoom::Frontend::get_explain_records(
 }
 
 
-Z_Records *yf::Zoom::Frontend::get_records(Package &package,
+Z_Records *yf::Zoom::Frontend::get_records(mp::Package &package,
                                            Odr_int start,
                                            Odr_int number_to_present,
                                            int *error,