projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96da048 08b13c6)
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ttopac
authorevergreen <evergreen@squeeze.debian>
Tue, 28 Jun 2011 15:08:51 +0000 (11:08 -0400)
committerevergreen <evergreen@squeeze.debian>
Tue, 28 Jun 2011 15:08:51 +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