old-git.evergreen-ils.org Git - evergreen/equinox.git/commit

projects / evergreen / equinox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b6c5cad 6ad459f)

author	Mike Rylander <mrylander@gmail.com>
	Mon, 14 Mar 2011 16:33:30 +0000 (12:33 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Mon, 14 Mar 2011 16:33:30 +0000 (12:33 -0400)
commit	0916cf2925049f7ce1817423010188e826b47714
tree	b178c49f94b2db3313001132fb088a70f35ca497	tree
parent	b6c5cad9dfcc1e4357ebe4bda15fbd64846aa6f1	commit \| diff
parent	6ad459f66ec0f263349fafa221e77e226d8580bf	commit \| diff

Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into masslnc-cataloging-enhancements

Open-ILS/src/sql/Pg/990.schema.unapi.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/opac/locale/en-US/lang.dtd	diff1 \|	diff2 \|	blob \| history

Evergreen working repo (Equinox)