about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2012-01-03 16:48:22 +0000
committerLars Hjemli2012-01-03 16:48:22 +0000
commitaa25ff3c8b548077f2793c1162f3610af03e63df (patch)
tree0bf7463ec07bd94115256d99a95c22ce0b9bce2a
parentui-ssdiff.c: set correct diffmode in "control panel" (diff)
parentMakefile: fetch git tarballs from http://hjemli.net/git/git/ (diff)
downloadcgit-aa25ff3c8b548077f2793c1162f3610af03e63df.tar.gz
cgit-aa25ff3c8b548077f2793c1162f3610af03e63df.zip
Merge branch 'stable'
-rw-r--r--Makefile2
-rw-r--r--cgit.css4
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile index 30f7575..bfe18c5 100644 --- a/Makefile +++ b/Makefile
@@ -13,7 +13,7 @@ pdfdir = $(docdir)
13mandir = $(prefix)/share/man 13mandir = $(prefix)/share/man
14SHA1_HEADER = <openssl/sha.h> 14SHA1_HEADER = <openssl/sha.h>
15GIT_VER = 1.7.4 15GIT_VER = 1.7.4
16GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 16GIT_URL = http://hjemli.net/git/git/snapshot/git-$(GIT_VER).tar.bz2
17INSTALL = install 17INSTALL = install
18MAN5_TXT = $(wildcard *.5.txt) 18MAN5_TXT = $(wildcard *.5.txt)
19MAN_TXT = $(MAN5_TXT) 19MAN_TXT = $(MAN5_TXT)
diff --git a/cgit.css b/cgit.css index 55afa94..3734ca7 100644 --- a/cgit.css +++ b/cgit.css
@@ -681,7 +681,7 @@ table.hgraph th {
681} 681}
682 682
683table.hgraph td { 683table.hgraph td {
684 vertical-align: center; 684 vertical-align: middle;
685 padding: 2px 2px; 685 padding: 2px 2px;
686} 686}
687 687
@@ -758,7 +758,7 @@ table.ssdiff td.lineno {
758} 758}
759 759
760table.ssdiff td.hunk { 760table.ssdiff td.hunk {
761 color: #black; 761 color: black;
762 background: #ccf; 762 background: #ccf;
763 border-top: solid 1px #aaa; 763 border-top: solid 1px #aaa;
764 border-bottom: solid 1px #aaa; 764 border-bottom: solid 1px #aaa;