| author | Lars Hjemli <hjemli@gmail.com> | 2007-10-01 10:51:04 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-01 10:51:04 (UTC) |
| commit | 9dda602ca3deaf9a78a90f4ba77008569ead5a4f (patch) (unidiff) | |
| tree | 06eaf597c005ab46f2065f8a5d3bd5e92c9b363c | |
| parent | 271829f269158c2ff818f72eb0c6f9de2a724126 (diff) | |
| parent | 2e3b6fc424f1a28ff57ed4e77ee9e68ebe0d8d6d (diff) | |
| download | cgit-9dda602ca3deaf9a78a90f4ba77008569ead5a4f.zip cgit-9dda602ca3deaf9a78a90f4ba77008569ead5a4f.tar.gz cgit-9dda602ca3deaf9a78a90f4ba77008569ead5a4f.tar.bz2 | |
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
| @@ -1,19 +1,19 @@ | |||
| 1 | CGIT_VERSION = v0.6.3 | 1 | CGIT_VERSION = v0.6.3 |
| 2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
| 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | 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 | # |
| 11 | # Let the user override the above settings. | 11 | # Let the user override the above settings. |
| 12 | # | 12 | # |
| 13 | -include cgit.conf | 13 | -include cgit.conf |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto | 16 | EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto |
| 17 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ | 17 | OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ |
| 18 | ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ | 18 | ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ |
| 19 | ui-snapshot.o ui-blob.o ui-tag.o | 19 | ui-snapshot.o ui-blob.o ui-tag.o |
diff --git a/git b/git | |||
| Subproject 806ea701ce3624aa6a89648b6ca5d858703398c | Subproject 552ce11006e39bd07efd79946f180df47aa35b4 | ||