projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99999c3 d8ca68f)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into social collab/dbs/social
authorDan Scott <dan@coffeecode.net>
Wed, 18 May 2011 15:08:36 +0000 (11:08 -0400)
committerDan Scott <dan@coffeecode.net>
Wed, 18 May 2011 15:08:36 +0000 (11:08 -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