projects
/
horde.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4826e67
0e4f4d6
)
Merge branch 'db-migrate-for-framework'
author
Jan Schneider
<jan@horde.org>
Wed, 26 Jan 2011 17:52:25 +0000
(18:52 +0100)
committer
Jan Schneider
<jan@horde.org>
Wed, 26 Jan 2011 17:52:25 +0000
(18:52 +0100)
Conflicts:
kronolith/scripts/upgrades/convert_datatree_shares_to_sql.php
kronolith/scripts/upgrades/convert_sql_shares_to_sqlng.php
1
2
components/lib/Components/Pear/Package/Filelist/Default.php
patch
|
diff1
|
diff2
|
blob
|
history
components/test/Components/Unit/Components/Pear/Package/Filelist/DefaultTest.php
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
components/lib/Components/Pear/Package/Filelist/Default.php
Simple merge
diff --cc
components/test/Components/Unit/Components/Pear/Package/Filelist/DefaultTest.php
Simple merge
projects / horde.git / commitdiff