diff options
| author | Lars Hjemli | 2007-10-01 12:51:04 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2007-10-01 12:51:04 +0200 |
| commit | 9dda602ca3deaf9a78a90f4ba77008569ead5a4f (patch) | |
| tree | 06eaf597c005ab46f2065f8a5d3bd5e92c9b363c | |
| parent | cgit.css: make diff headers more visible (diff) | |
| parent | Use git-1.5.3.3 (diff) | |
| download | cgit-9dda602ca3deaf9a78a90f4ba77008569ead5a4f.tar.gz cgit-9dda602ca3deaf9a78a90f4ba77008569ead5a4f.zip | |
Merge branch 'stable'
* stable: Use git-1.5.3.3
| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | git | 0 |
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 | |||
| 4 | CGIT_CONFIG = /etc/cgitrc | 4 | CGIT_CONFIG = /etc/cgitrc |
| 5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
| 6 | SHA1_HEADER = <openssl/sha.h> | 6 | SHA1_HEADER = <openssl/sha.h> |
| 7 | GIT_VER = 1.5.3.2 | 7 | GIT_VER = 1.5.3.3 |
| 8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 8 | GIT_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 | ||