old-git.evergreen-ils.org Git - working/Evergreen.git/commit

projects / working / Evergreen.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c186e12 72db882)

author	Bill Erickson <berick@esilibrary.com>
	Thu, 11 Aug 2011 21:48:00 +0000 (17:48 -0400)
committer	Bill Erickson <berick@esilibrary.com>
	Thu, 11 Aug 2011 21:48:00 +0000 (17:48 -0400)
commit	78ef0457cf7c21a148b590291484fb16340bb408
tree	d4035d72435641f2095cb5e670e1dea068aaa352	tree
parent	c186e123539192b23fddc6cd7683fe4a1c80c34c	commit \| diff
parent	72db8825b3ca72fe29f6fa0b9df838484013fe54	commit \| diff

Merge esi/template-toolkit-opac and repaired some conflicts

Signed-off-by: Bill Erickson <berick@esilibrary.com>

Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/default/opac/parts/header.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/misc_util.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/cnbrowse.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/extras.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/subjects.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/summary.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/record/summaryplus.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/opac/parts/result/table.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/import_errors.tt2	diff1 \|	\|	blob \| history

Evergreen ILS