projects / evergreen-equinox.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5e966ff 07594b1)
Merge branch 'kcls-grey-screen' of ssh://senator@yeti.esilibrary.com/home/evergreen...
authorsenator <lebbeous@esilibrary.com>
Thu, 3 Mar 2011 16:22:31 +0000 (11:22 -0500)
committersenator <lebbeous@esilibrary.com>
Thu, 3 Mar 2011 16:22:31 +0000 (11:22 -0500)
commit0f359706c32676fdcac506fa0bedaff85108d025
tree01b8cd347e35ff657eb785eb00fdfc23e7954797tree | snapshot
parent5e966ff2df4c1f732bbfa6b1ab8f9eeddf97b811commit | diff
parent07594b1482286b733cf1b6a44e3c789aa552e908commit | diff
Merge branch 'kcls-grey-screen' of ssh://senator@yeti.esilibrary.com/home/evergreen/evergreen-equinox into kcls-grey-screen

Conflicts:

Open-ILS/web/opac/skin/kcls/js/myopac.js
Open-ILS/web/opac/skin/kcls/js/myopac.js diff1 | diff2 | blob | history
Evergreen with Equinox developments in process and local tweaks