projects / evergreen-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a232eb 9ef4193)
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
authorMike Rylander <mrylander@gmail.com>
Tue, 3 May 2011 15:10:59 +0000 (11:10 -0400)
committerMike Rylander <mrylander@gmail.com>
Tue, 3 May 2011 15:10:59 +0000 (11:10 -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