From: Lars Hjemli <hjemli@gmail.com>
Date: Fri, 9 Nov 2007 12:52:48 +0000 (+0100)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/ab21082c21867e035cd925a06d6d55fb3143d883

Merge branch 'stable'

* stable:
  CGIT 0.7.1
  Makefile install: include cgit.png, do not empty cache

Conflicts:

	Makefile
---

ab21082c21867e035cd925a06d6d55fb3143d883
diff --cc Makefile
index dbc34a2,27e966d..685e662
--- a/Makefile
+++ b/Makefile
@@@ -19,12 -19,7 +19,12 @@@ OBJECTS = shared.o cache.o parsing.o ht
  	ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o
  
  
 +ifdef NEEDS_LIBICONV
 +	EXTLIBS += -liconv
 +endif
 +
 +
- .PHONY: all git install clean distclean force-version get-git
+ .PHONY: all git install clean distclean emptycache force-version get-git
  
  all: cgit git