projects
/
koha.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
86e2fbb
2234369
)
Merge remote branch 'kc/master' into new/enh/bug_5917
author
Chris Cormack
<chrisc@catalyst.net.nz>
Wed, 30 Mar 2011 07:53:45 +0000
(20:53 +1300)
committer
Chris Cormack
<chrisc@catalyst.net.nz>
Wed, 30 Mar 2011 07:53:45 +0000
(20:53 +1300)
Conflicts:
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
1
2
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
patch
|
diff1
|
diff2
|
blob
|
history
installer/data/mysql/pl-PL/mandatory/sysprefs.sql
patch
|
diff1
|
diff2
|
blob
|
history
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
Simple merge
diff --cc
installer/data/mysql/pl-PL/mandatory/sysprefs.sql
Simple merge
diff --cc
installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
Simple merge
projects / koha.git / commitdiff