projects / evergreen-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3154cb3 007195f)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into social
authorMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 18:11:01 +0000 (14:11 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 17 May 2011 18:11:01 +0000 (14:11 -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 with Equinox developments in process and local tweaks