projects / contrib / Conifer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb3e2a2 73ef5cf)
Merge branch 'master' of git://git.evergreen-ils.org/Evergreen into ttopac
authorevergreen <evergreen@squeeze.debian>
Fri, 15 Jul 2011 23:49:55 +0000 (19:49 -0400)
committerevergreen <evergreen@squeeze.debian>
Fri, 15 Jul 2011 23:49:55 +0000 (19:49 -0400)
1  2 
Open-ILS/examples/fm_IDL.xml patch | diff1 | diff2 | blob | history
Open-ILS/src/perlmods/lib/OpenILS/Application/Actor.pm patch | diff1 | diff2 | blob | history

diff --cc Open-ILS/examples/fm_IDL.xml
Simple merge
Evergreen contribs