[gitolite/el5/master: 23/24] Merge branch 'master' into el5
Lubomir Rintel
lkundrak at fedoraproject.org
Thu Feb 24 15:18:03 UTC 2011
commit b5124b20e37618dd0f4986397a3020e713e4b9a8
Merge: 9ae9514 4fd910d
Author: Lubomir Rintel <lkundrak at v3.sk>
Date: Thu Feb 24 16:17:26 2011 +0100
Merge branch 'master' into el5
Conflicts:
.gitignore
README
gitolite.spec
sources
.gitignore | 8 +-
README | 7 +-
adcfix.post-v2.patch | 20 +++
gitolite-1.3-conf.patch | 10 ++
gitolite-1.3-rpm.patch | 332 +++++++++++++++++++++++++++++++++++++++++++++
gitolite-1.4.2-conf.patch | 10 ++
gitolite-1.4.2-rpm.patch | 187 +++++++++++++++++++++++++
gitolite-1.5-rpm.patch | 207 ++++++++++++++++++++++++++++
gitolite-1.5.6-rpm.patch | 180 ++++++++++++++++++++++++
gitolite-1.5.7-rpm.patch | 138 +++++++++++++++++++
gitolite-1.5.9-rpm.patch | 183 +++++++++++++++++++++++++
gitolite-README-fedora | 37 +++++
gitolite.spec | 103 ++++++++++++--
sources | 2 +-
14 files changed, 1406 insertions(+), 18 deletions(-)
---
More information about the scm-commits
mailing list