From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 19 Feb 2011 13:51:00 +0000 (+0100)
Subject: Merge branch 'br/misc'
X-Git-Tag: v0.9~4
X-Git-Url: https://git.cameronkatri.com/cgit.git/commitdiff_plain/979c460e7f71d153ae79da67b8b21c3412f0fe02

Merge branch 'br/misc'

* br/misc:
  Use transparent background for the cgit logo
  ssdiff: anchors for ssdiff
  implement repo.logo and repo.logo-link
---

979c460e7f71d153ae79da67b8b21c3412f0fe02
diff --cc cgit.h
index 74aa340,8a9d5fa..b5f00fc
--- a/cgit.h
+++ b/cgit.h
@@@ -71,8 -70,9 +71,10 @@@ struct cgit_repo 
  	char *readme;
  	char *section;
  	char *clone_url;
+ 	char *logo;
+ 	char *logo_link;
  	int snapshots;
 +	int enable_commit_graph;
  	int enable_log_filecount;
  	int enable_log_linecount;
  	int enable_remote_branches;