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

projects / evergreen / equinox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9d9ac91 19bde8a)

author	Mike Rylander <mrylander@gmail.com>
	Sat, 23 Apr 2011 15:40:18 +0000 (11:40 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Sat, 23 Apr 2011 15:40:18 +0000 (11:40 -0400)
commit	32d56416491234dbbcdd53e6b4a4801d61e43725
tree	7e9267f3923a2e8e7289352d123f12f017356986	tree
parent	9d9ac91e346c5610626051af6517cb4ad96ddadc	commit \| diff
parent	19bde8a44fbff9dc4b5e8cdec6cbcef335049d4b	commit \| diff

Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equinox into vandelay-improvement

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/main/menu.js	diff1 \|	diff2 \|	blob \| history

Evergreen working repo (Equinox)