projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b36faf 89cda84)
Merge remote branch 'kc/new/biblibre_reports' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 13 Dec 2010 17:31:00 +0000 (06:31 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 13 Dec 2010 17:31:00 +0000 (06:31 +1300)
1  2 
C4/Reports/Guided.pm patch | diff1 | diff2 | blob | history
reports/guided_reports.pl patch | diff1 | diff2 | blob | history

diff --cc C4/Reports/Guided.pm
Simple merge
diff --cc reports/guided_reports.pl
Simple merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git