old-git.evergreen-ils.org Git - contrib/Conifer.git/commit

projects / contrib / Conifer.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f7550e1 817a79b)

author	Bill Erickson <berick@esilibrary.com>
	Mon, 29 Aug 2011 17:08:15 +0000 (13:08 -0400)
committer	Bill Erickson <berick@esilibrary.com>
	Mon, 29 Aug 2011 17:08:15 +0000 (13:08 -0400)
commit	e97ae45e48e3df2fb697886d8cdef61f9e24228e
tree	1b49114f1454a418ef37476a4a212e5b2524505a	tree
parent	f7550e1a26ec9eae0927b03516e5ce214204885b	commit \| diff
parent	817a79b3c110e278b560f0f88f4fcfd30faa91a4	commit \| diff

Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge

12 files changed:

Open-ILS/examples/fm_IDL.xml	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/Makefile.am	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/templates/default/acq/common/li_table.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/acq/lineitem/related.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/conify/global/booking/resource.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/conify/global/booking/resource_attr.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/conify/global/booking/resource_attr_map.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/conify/global/booking/resource_attr_value.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/conify/global/booking/resource_type.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/queue.tt2	diff1 \|	\|	blob \| history
Open-ILS/src/templates/default/vandelay/inc/upload.tt2	diff1 \|	\|	blob \| history

Evergreen contribs