From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 27 Jan 2009 22:03:05 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/a61871a18ffa9fc28e7ab0950415404350c8c857?hp=-c

Merge branch 'stable'
---

a61871a18ffa9fc28e7ab0950415404350c8c857
diff --combined Makefile
index a52285e,52b3586..19e3bb8
--- a/Makefile
+++ b/Makefile
@@@ -1,11 -1,11 +1,11 @@@
- CGIT_VERSION = v0.8.1
+ CGIT_VERSION = v0.8.1.1
  CGIT_SCRIPT_NAME = cgit.cgi
  CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
  CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
  CGIT_CONFIG = /etc/cgitrc
  CACHE_ROOT = /var/cache/cgit
  SHA1_HEADER = <openssl/sha.h>
 -GIT_VER = 1.6.0.3
 +GIT_VER = 1.6.1
  GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
  INSTALL = install
  
@@@ -90,7 -90,6 +90,7 @@@ OBJECTS += ui-refs.
  OBJECTS += ui-repolist.o
  OBJECTS += ui-shared.o
  OBJECTS += ui-snapshot.o
 +OBJECTS += ui-stats.o
  OBJECTS += ui-summary.o
  OBJECTS += ui-tag.o
  OBJECTS += ui-tree.o