projects / horde.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0c18d9 87af970)
Merge branch 'master' of dev.horde.org:/horde/git/horde
authorJan Schneider <jan@horde.org>
Wed, 26 Jan 2011 21:13:41 +0000 (22:13 +0100)
committerJan Schneider <jan@horde.org>
Wed, 26 Jan 2011 21:13:41 +0000 (22:13 +0100)
Conflicts:
horde/scripts/sql/horde_histories.mssql.sql
horde/scripts/sql/horde_histories.pgsql.sql

1  2 
framework/History/package.xml patch | diff1 | diff2 | blob | history

diff --cc framework/History/package.xml
Simple merge
Unnamed repository; edit this file to name it for gitweb.