[commits] Horde-Support branch master updated. 6efabd28753fd04679c5de4240cfd65eb956820a

Jan Schneider jan at horde.org
Mon Feb 8 18:07:56 UTC 2010 

The branch "master" has been updated.
The following is a summary of the commits.

from: bc0aae6aa6c511903e00fddf4abbb909891b545e

ad50957 I swear I committed this already.
c998848 Merge branch 'master' of ssh://dev.horde.org/horde/git/horde-support
6efabd2 Fix merge

-----------------------------------------------------------------------

commit ad5095709900c1a86d5fdb90409d24ec24a03941
Author: Jan Schneider <jan at horde.org>
Date:   Mon Jul 27 23:11:53 2009 +0200

    I swear I committed this already.

 maintainer-tools/package.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

http://git.horde.org/diff.php/maintainer-tools/package.xml?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=ad5095709900c1a86d5fdb90409d24ec24a03941

-----------------------------------------------------------------------

commit c998848f4f15c561908af309b067f749a0e8aa6c
Author: Jan Schneider <jan at horde.org>
Date:   Mon Feb 8 19:04:16 2010 +0100

    Merge branch 'master' of ssh://dev.horde.org/horde/git/horde-support
    
    Conflicts:
    	maintainer-tools/package.xml

 .gitignore                                          |    4 +-
 codesniffer/Horde/HordeCodingStandard.php           |    5 +-
 git-hooks/commit-update-tickets-conf.php.dist       |   17 +++
 git-hooks/commit-update-tickets.php                 |  140 +++++++++++++++++++
 git-hooks/email-sender                              |    2 +-
 git-hooks/post-receive-email                        |   99 ++++++++++---
 maintainer-tools/README                             |    9 +-
 maintainer-tools/horde-build-snaps.php              |   76 +++++------
 maintainer-tools/horde-build-website-docs.conf.dist |    3 +
 maintainer-tools/horde-build-website-docs.sh        |   69 ++++------
 maintainer-tools/horde-compress-pngs.php            |   37 ++---
 maintainer-tools/horde-js-compress.php              |   14 +--
 maintainer-tools/horde-make-release-conf.php.dist   |   11 +--
 maintainer-tools/horde-make-release.php             |    4 +-
 maintainer-tools/horde-patch-config.php             |   17 ---
 maintainer-tools/horde-patch-config.sh              |   26 ++++
 maintainer-tools/horde-run-task.php                 |   77 ++++++++++
 maintainer-tools/horde-update-ISO3166-countries.php |   15 +--
 maintainer-tools/horde-update-protaculous.php       |   39 -----
 maintainer-tools/jsmin/.cvsignore                   |    2 -
 maintainer-tools/mime_mapping/CVS/Entries           |    6 -
 maintainer-tools/mime_mapping/CVS/Repository        |    1 -
 maintainer-tools/mime_mapping/CVS/Root              |    1 -
 maintainer-tools/mime_mapping/CVS/Template          |    8 -
 maintainer-tools/mime_mapping/Makefile              |    2 -
 maintainer-tools/mime_mapping/convert.php           |    4 +-
 maintainer-tools/mime_mapping/mime.types.horde      |    2 -
 maintainer-tools/package.xml                        |    5 +
 svn-hooks/commit-php-syntax-check.php               |    2 +-
 svn-hooks/commit-update-tickets.php                 |    3 +-
 30 files changed, 447 insertions(+), 253 deletions(-)
 create mode 100644 git-hooks/commit-update-tickets-conf.php.dist
 create mode 100755 git-hooks/commit-update-tickets.php
 mode change 100644 => 100755 git-hooks/post-receive
 create mode 100644 maintainer-tools/horde-build-website-docs.conf.dist
 delete mode 100755 maintainer-tools/horde-patch-config.php
 create mode 100755 maintainer-tools/horde-patch-config.sh
 create mode 100755 maintainer-tools/horde-run-task.php
 delete mode 100755 maintainer-tools/horde-update-protaculous.php
 delete mode 100644 maintainer-tools/jsmin/.cvsignore
 delete mode 100644 maintainer-tools/mime_mapping/CVS/Entries
 delete mode 100644 maintainer-tools/mime_mapping/CVS/Repository
 delete mode 100644 maintainer-tools/mime_mapping/CVS/Root
 delete mode 100644 maintainer-tools/mime_mapping/CVS/Template

http://git.horde.org/diff.php/.gitignore?rt=horde-support&r1=84d622f948b9703e99f3a97e34335d221a93b93d&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/codesniffer/Horde/HordeCodingStandard.php?rt=horde-support&r1=0b9b9f429839ad356a8267c37a150cdc95ed2f30&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/co.php/git-hooks/commit-update-tickets-conf.php.dist?rt=horde-support&r=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/co.php/git-hooks/commit-update-tickets.php?rt=horde-support&r=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/git-hooks/email-sender?rt=horde-support&r1=140fc8a95be6e263466555a15c48b734d4129f62&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/git-hooks/post-receive?rt=horde-support&r1=a84c07ad9300a1606d9f2888b3ae86fbbc32fdad&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/git-hooks/post-receive-email?rt=horde-support&r1=6c4abbcc83143892afb0eeeb653e76b83771386c&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/README?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/horde-build-snaps.php?rt=horde-support&r1=f1ba35d3674be565d15c8fd159a16e124bd6255d&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/co.php/maintainer-tools/horde-build-website-docs.conf.dist?rt=horde-support&r=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/horde-build-website-docs.sh?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/horde-compress-pngs.php?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/horde-js-compress.php?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/horde-make-release-conf.php.dist?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/horde-make-release.php?rt=horde-support&r1=da4702579eb47b624f7976e5465ed95650abf1ca&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/horde-patch-config.php?rt=horde-support&r1=302c0992bf52f24282fa28f6b7d77e1afdff27c9&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/co.php/maintainer-tools/horde-patch-config.sh?rt=horde-support&r=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/co.php/maintainer-tools/horde-run-task.php?rt=horde-support&r=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/horde-update-ISO3166-countries.php?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/horde-update-protaculous.php?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/jsmin/.cvsignore?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/mime_mapping/CVS/Entries?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/mime_mapping/CVS/Repository?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/mime_mapping/CVS/Root?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/mime_mapping/CVS/Template?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/mime_mapping/Makefile?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/mime_mapping/convert.php?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/mime_mapping/mime.types.horde?rt=horde-support&r1=ccbd0e6f6fa7abdcaad27f50c0df3faec8ffe136&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/maintainer-tools/package.xml?rt=horde-support&r1=ad5095709900c1a86d5fdb90409d24ec24a03941&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/svn-hooks/commit-php-syntax-check.php?rt=horde-support&r1=ab31f30eb0915425177fa79d10da8bd339f141a1&r2=c998848f4f15c561908af309b067f749a0e8aa6c
http://git.horde.org/diff.php/svn-hooks/commit-update-tickets.php?rt=horde-support&r1=ab31f30eb0915425177fa79d10da8bd339f141a1&r2=c998848f4f15c561908af309b067f749a0e8aa6c

-----------------------------------------------------------------------

commit 6efabd28753fd04679c5de4240cfd65eb956820a
Merge: c998848 bc0aae6
Author: Jan Schneider <jan at horde.org>
Date:   Mon Feb 8 19:07:38 2010 +0100

    Fix merge

 maintainer-tools/package.xml |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

http://git.horde.org/diff.php/maintainer-tools/package.xml?rt=horde-support&r1=c998848f4f15c561908af309b067f749a0e8aa6c&r2=6efabd28753fd04679c5de4240cfd65eb956820a

More information about the commits mailing list