projects / evergreen-equinox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23f951a 3dfc7f0)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/ttopac-master-merge
authorDan Scott <dan@coffeecode.net>
Thu, 18 Aug 2011 13:22:17 +0000 (09:22 -0400)
committerDan Scott <dan@coffeecode.net>
Thu, 18 Aug 2011 13:22:17 +0000 (09:22 -0400)
1  2 
Open-ILS/src/Makefile.am patch | diff1 | diff2 | blob | history
Open-ILS/src/perlmods/MANIFEST patch | diff1 | diff2 | blob | history

diff --cc Open-ILS/src/Makefile.am
Simple merge
diff --cc Open-ILS/src/perlmods/MANIFEST
Simple merge
Evergreen with Equinox developments in process and local tweaks