projects / evergreen / equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e08a26 281310c)
Merge branch 'master' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen-equin...
authorMike Rylander <mrylander@gmail.com>
Fri, 18 Mar 2011 17:44:51 +0000 (13:44 -0400)
committerMike Rylander <mrylander@gmail.com>
Fri, 18 Mar 2011 17:44:51 +0000 (13:44 -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 working repo (Equinox)