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

projects / evergreen / equinox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6e64fa1 80c12c4)

author	Mike Rylander <mrylander@gmail.com>
	Thu, 2 Jun 2011 14:34:48 +0000 (10:34 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Thu, 2 Jun 2011 14:34:48 +0000 (10:34 -0400)
commit	100723078317805cf07f2c45566d2eb8a4698925
tree	ba5d2a7ec1d0cd666466a23a701384febd22ed7c	tree
parent	6e64fa1b15b24ca10188609bb878fe0ee0fdca68	commit \| diff
parent	80c12c43dc423c52a0b4332e7b390f79183684a0	commit \| diff

Hand-fixed merge

Signed-off-by: Mike Rylander <mrylander@gmail.com>

Open-ILS/src/sql/Pg/002.schema.config.sql	diff1 \|	diff2 \|	blob \| history
Open-ILS/src/sql/Pg/950.data.seed-values.sql	diff1 \|	diff2 \|	blob \| history

Evergreen working repo (Equinox)