projects / evergreen-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99999c3 f40b83b)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into social
authorMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 20:35:54 +0000 (16:35 -0400)
committerMike Rylander <mrylander@gmail.com>
Mon, 16 May 2011 20:35:54 +0000 (16:35 -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