about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-10-01 12:51:04 +0200
committerLars Hjemli2007-10-01 12:51:04 +0200
commit9dda602ca3deaf9a78a90f4ba77008569ead5a4f (patch)
tree06eaf597c005ab46f2065f8a5d3bd5e92c9b363c
parentcgit.css: make diff headers more visible (diff)
parentUse git-1.5.3.3 (diff)
downloadcgit-9dda602ca3deaf9a78a90f4ba77008569ead5a4f.tar.gz
cgit-9dda602ca3deaf9a78a90f4ba77008569ead5a4f.zip
Merge branch 'stable'
* stable:
  Use git-1.5.3.3
-rw-r--r--Makefile2
m---------git0
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile index bfb99b8..8e3da72 100644 --- a/Makefile +++ b/Makefile
@@ -4,7 +4,7 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.5.3.2 7GIT_VER = 1.5.3.3
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9 9
10# 10#
diff --git a/git b/git
Subproject 806ea701ce3624aa6a89648b6ca5d858703398c Subproject 552ce11006e39bd07efd79946f180df47aa35b4