projects
/
metaproxy-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
4c528bf
)
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
author
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 9 May 2012 10:58:36 +0000
(12:58 +0200)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 9 May 2012 10:58:36 +0000
(12:58 +0200)
Conflicts:
src/metaproxy_prog.cpp
src/filter_zoom.cpp
patch
|
blob
|
history
diff --git
a/src/filter_zoom.cpp
b/src/filter_zoom.cpp
index
481ad35
..
a75c4d4
100644
(file)
--- 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,