diff options
author | Lars Hjemli | 2012-01-03 16:48:22 +0000 |
---|---|---|
committer | Lars Hjemli | 2012-01-03 16:48:22 +0000 |
commit | aa25ff3c8b548077f2793c1162f3610af03e63df (patch) | |
tree | 0bf7463ec07bd94115256d99a95c22ce0b9bce2a | |
parent | 195742572681d6c2583de392131d1be86ef52f48 (diff) | |
parent | fbd254d54e28e002a0d56b81c192156599df1e6b (diff) | |
download | cgit-aa25ff3c8b548077f2793c1162f3610af03e63df.tar.gz cgit-aa25ff3c8b548077f2793c1162f3610af03e63df.tar.bz2 cgit-aa25ff3c8b548077f2793c1162f3610af03e63df.zip |
Merge branch 'stable'
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | cgit.css | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -13,7 +13,7 @@ pdfdir = $(docdir) | |||
13 | mandir = $(prefix)/share/man | 13 | mandir = $(prefix)/share/man |
14 | SHA1_HEADER = <openssl/sha.h> | 14 | SHA1_HEADER = <openssl/sha.h> |
15 | GIT_VER = 1.7.4 | 15 | GIT_VER = 1.7.4 |
16 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 16 | GIT_URL = http://hjemli.net/git/git/snapshot/git-$(GIT_VER).tar.bz2 |
17 | INSTALL = install | 17 | INSTALL = install |
18 | MAN5_TXT = $(wildcard *.5.txt) | 18 | MAN5_TXT = $(wildcard *.5.txt) |
19 | MAN_TXT = $(MAN5_TXT) | 19 | MAN_TXT = $(MAN5_TXT) |
@@ -681,7 +681,7 @@ table.hgraph th { | |||
681 | } | 681 | } |
682 | 682 | ||
683 | table.hgraph td { | 683 | table.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 | ||
760 | table.ssdiff td.hunk { | 760 | table.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; |