projects / evergreen / equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b8bf8d 4fee07d)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into acq-invoice-inline...
authorBill Erickson <berick@esilibrary.com>
Tue, 31 Jul 2012 01:16:40 +0000 (21:16 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 31 Jul 2012 01:16:40 +0000 (21:16 -0400)
1  2 
Open-ILS/examples/fm_IDL.xml patch | diff1 | diff2 | blob | history

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
Evergreen working repo (Equinox)