]> git.evergreen-ils.org Git - working/Evergreen.git/commit
projects / working / Evergreen.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2c04438) | patch
conflict resolution for z3950 import
authorphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 26 Apr 2006 18:47:55 +0000 (18:47 +0000)
committerphasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Wed, 26 Apr 2006 18:47:55 +0000 (18:47 +0000)
commit0d27a5ca449fc903793432fabc51e4091c08f14e
tree07c7e9ddd4ff569d12f0ef69b3ee1a882aba2422tree
parent2c04438c03f678b9709c1faff451c2a1c0f26d39commit | diff
conflict resolution for z3950 import

git-svn-id: svn://svn.open-ils.org/ILS/trunk@3899 dcc99617-32d9-48b4-a31d-7c20da2025e4
Open-ILS/xul/staff_client/server/cat/copy_editor.js diff | blob | history
Open-ILS/xul/staff_client/server/cat/z3950.js diff | blob | history
Evergreen ILS