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

author	dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
	Sun, 9 Mar 2008 16:41:31 +0000 (16:41 +0000)
committer	dbs <dbs@dcc99617-32d9-48b4-a31d-7c20da2025e4>
	Sun, 9 Mar 2008 16:41:31 +0000 (16:41 +0000)
commit	a6e3485163835c27c6cef157be9e9706edaa7316
tree	cef67a1e79857bb6fbe18563008cea41fdec19eb	tree
parent	ae328d42bd00c117556be3685f75f3c8c1c7cd35	commit \| diff

Merge trunk changes to enable building acq and trunk on same box

svn merge -r8456:8457 svn://svn.open-ils.org/ILS/trunk .
svn merge -r8498:8499 svn://svn.open-ils.org/ILS/trunk .
svn merge -r8547:8552 svn://svn.open-ils.org/ILS/trunk .

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@8935 dcc99617-32d9-48b4-a31d-7c20da2025e4

Evergreen ILS

RSS Atom

Makefile		diff \| blob \| history
Open-ILS/include/openils/oils_event.h		diff \| blob \| history
Open-ILS/include/openils/oils_utils.h		diff \| blob \| history
Open-ILS/src/c-apps/oils_dataloader.c		diff \| blob \| history
Open-ILS/src/c-apps/oils_event.c		diff \| blob \| history
Open-ILS/src/c-apps/oils_idl-core.c		diff \| blob \| history
Open-ILS/src/c-apps/oils_utils.c		diff \| blob \| history