]> git.cameronkatri.com Git - cgit.git/commitdiff
Merge branch 'br/misc'
authorLars Hjemli <hjemli@gmail.com>
Sat, 19 Feb 2011 13:51:00 +0000 (14:51 +0100)
committerLars Hjemli <hjemli@gmail.com>
Sat, 19 Feb 2011 13:51:00 +0000 (14:51 +0100)
* br/misc:
  Use transparent background for the cgit logo
  ssdiff: anchors for ssdiff
  implement repo.logo and repo.logo-link

1  2 
cgit.c
cgit.css
cgit.h
cgitrc.5.txt

diff --cc cgit.c
Simple merge
diff --cc cgit.css
Simple merge
diff --cc cgit.h
index 74aa340b1014d1cebb965202d29638d0236356ac,8a9d5fa6a86723ddf964ca8f51ae1a4f9f756006..b5f00fc9c1c1d6d6e7f7a8cdc2695cab334752ab
--- 1/cgit.h
--- 2/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;
diff --cc cgitrc.5.txt
Simple merge