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

author	Mike Rylander <mrylander@gmail.com>
	Tue, 12 Apr 2011 17:41:19 +0000 (13:41 -0400)
committer	Mike Rylander <mrylander@gmail.com>
	Tue, 12 Apr 2011 17:41:19 +0000 (13:41 -0400)
commit	dac4474857b0c415efb7383f6986961870ee4d53
tree	c3a5343c03bd01a654dcc0556c1884c4d986f8e4	tree
parent	3e034f6558d4c1e930ad131a1a1a6a66d8ed0995	commit \| diff

Corrected merge from trunk

Evergreen working repo (Equinox)

Open-ILS/src/sql/Pg/000.functions.general.sql		diff \| blob \| history
Open-ILS/src/sql/Pg/002.functions.config.sql		diff \| blob \| history
Open-ILS/src/sql/Pg/002.schema.config.sql		diff \| blob \| history
Open-ILS/src/sql/Pg/010.schema.biblio.sql		diff \| blob \| history
Open-ILS/src/sql/Pg/012.schema.vandelay.sql		diff \| blob \| history
Open-ILS/src/sql/Pg/030.schema.metabib.sql		diff \| blob \| history
Open-ILS/src/sql/Pg/040.schema.asset.sql		diff \| blob \| history
Open-ILS/src/sql/Pg/990.schema.unapi.sql		diff \| blob \| history
Open-ILS/src/sql/Pg/upgrade/0509.schema.better_maintain_901.sql	[new file with mode: 0644]	blob
Open-ILS/src/sql/Pg/upgrade/0510.schema.search_path.sql	[new file with mode: 0644]	blob