projects
/
evergreen
/
equinox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4c7f603
f762b75
)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into vandelay-improvement
author
Mike Rylander
<mrylander@gmail.com>
Mon, 27 Jun 2011 22:59:43 +0000
(18:59 -0400)
committer
Mike Rylander
<mrylander@gmail.com>
Mon, 27 Jun 2011 22:59:43 +0000
(18:59 -0400)
1
2
Open-ILS/src/sql/Pg/002.schema.config.sql
patch
|
diff1
|
diff2
|
blob
|
history
Open-ILS/src/sql/Pg/999.functions.global.sql
patch
|
diff1
|
diff2
|
blob
|
history
Open-ILS/web/opac/locale/en-US/lang.dtd
patch
|
diff1
|
diff2
|
blob
|
history
Open-ILS/xul/staff_client/chrome/content/main/menu.js
patch
|
diff1
|
diff2
|
blob
|
history
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Open-ILS/src/sql/Pg/002.schema.config.sql
Simple merge
diff --cc
Open-ILS/src/sql/Pg/999.functions.global.sql
Simple merge
diff --cc
Open-ILS/web/opac/locale/en-US/lang.dtd
Simple merge
diff --cc
Open-ILS/xul/staff_client/chrome/content/main/menu.js
Simple merge
diff --cc
Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Simple merge
projects / evergreen / equinox.git / commitdiff