projects
/
evergreen
/
equinox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4f0e795
38332f0
)
Merge branch 'master' of git.evergreen-ils.org:Evergreen into volume_copy_delete
author
Bill Erickson
<berick@esilibrary.com>
Fri, 17 Jun 2011 15:39:57 +0000
(11:39 -0400)
committer
Bill Erickson
<berick@esilibrary.com>
Fri, 17 Jun 2011 15:39:57 +0000
(11:39 -0400)
1
2
Open-ILS/src/sql/Pg/950.data.seed-values.sql
patch
|
diff1
|
diff2
|
blob
|
history
Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Open-ILS/src/sql/Pg/950.data.seed-values.sql
Simple merge
diff --cc
Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
Simple merge
projects / evergreen / equinox.git / commitdiff