From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 3 Jan 2012 16:48:22 +0000 (+0000)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/aa25ff3c8b548077f2793c1162f3610af03e63df?hp=-c

Merge branch 'stable'
---

aa25ff3c8b548077f2793c1162f3610af03e63df
diff --combined Makefile
index 30f7575,7836963..bfe18c5
--- a/Makefile
+++ b/Makefile
@@@ -13,7 -13,7 +13,7 @@@ pdfdir = $(docdir
  mandir = $(prefix)/share/man
  SHA1_HEADER = <openssl/sha.h>
  GIT_VER = 1.7.4
- GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+ GIT_URL = http://hjemli.net/git/git/snapshot/git-$(GIT_VER).tar.bz2
  INSTALL = install
  MAN5_TXT = $(wildcard *.5.txt)
  MAN_TXT  = $(MAN5_TXT)
@@@ -198,9 -198,9 +198,9 @@@ install-pdf: doc-pd
  	$(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
  
  uninstall:
 -	rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 -	rm -f $(CGIT_DATA_PATH)/cgit.css
 -	rm -f $(CGIT_DATA_PATH)/cgit.png
 +	rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
 +	rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
 +	rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
  
  uninstall-doc: uninstall-man uninstall-html uninstall-pdf
  
diff --combined cgit.css
index 55afa94,8f409c3..3734ca7
--- a/cgit.css
+++ b/cgit.css
@@@ -331,33 -331,6 +331,33 @@@ table.commit-info 
  	margin-top: 1.5em;
  }
  
 +div.cgit-panel {
 +	float: right;
 +	margin-top: 1.5em;
 +}
 +
 +div.cgit-panel table {
 +	border-collapse: collapse;
 +	border: solid 1px #aaa;
 +	background-color: #eee;
 +}
 +
 +div.cgit-panel th {
 +	text-align: center;
 +}
 +
 +div.cgit-panel td {
 +	padding: 0.25em 0.5em;
 +}
 +
 +div.cgit-panel td.label {
 +	padding-right: 0.5em;
 +}
 +
 +div.cgit-panel td.ctrl {
 +	padding-left: 0.5em;
 +}
 +
  table.commit-info th {
  	text-align: left;
  	font-weight: normal;
@@@ -681,7 -654,7 +681,7 @@@ table.hgraph th 
  }
  
  table.hgraph td {
- 	vertical-align: center;
+ 	vertical-align: middle;
  	padding: 2px 2px;
  }
  
@@@ -758,7 -731,7 +758,7 @@@ table.ssdiff td.lineno 
  }
  
  table.ssdiff td.hunk {
- 	color: #black;
+ 	color: black;
  	background: #ccf;
  	border-top: solid 1px #aaa;
  	border-bottom: solid 1px #aaa;