projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 040b1a3 b6de97d)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into user/berick/hold-cap...
authorBill Erickson <berick@esilibrary.com>
Tue, 17 Jul 2012 13:07:22 +0000 (09:07 -0400)
committerBill Erickson <berick@esilibrary.com>
Tue, 17 Jul 2012 13:07:22 +0000 (09:07 -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 ILS