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

author	Mike Rylander <mrylander@gmail.com>
	Mon, 7 Mar 2011 16:06:35 +0000 (11:06 -0500)
committer	Mike Rylander <mrylander@gmail.com>
	Mon, 7 Mar 2011 16:06:35 +0000 (11:06 -0500)
commit	fa58a25b18b6e893558ca95b920b0ee3d0bffb9c
tree	28ead0e4027e116439fcf531720e3e6f1cfe80d1	tree
parent	942ae06bd2ae8195916964ee1422024cd36f78ca	commit \| diff
parent	334a1a03414f0a1910a4d4bf1b53731f0ca3b22c	commit \| diff

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

Evergreen working repo (Equinox)

Open-ILS/examples/fm_IDL.xml	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/perlmods/lib/OpenILS/Application/Search/Biblio.pm	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/web/opac/locale/en-US/lang.dtd	diff1 \|	diff2 \|	blob \| history
Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js	diff1 \|	diff2 \|	blob \| history
Open-ILS/xul/staff_client/chrome/content/main/constants.js	diff1 \|	diff2 \|	blob \| history
Open-ILS/xul/staff_client/server/cat/copy_editor.js	diff1 \|	diff2 \|	blob \| history