author | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 19:16:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-27 19:16:37 (UTC) |
commit | 7710178e45dee61e85ea77c4221309ce8c086f95 (patch) (unidiff) | |
tree | 281c5251777308f18c05d323183b28470445f4bc /Makefile | |
parent | e78186dcb63ec67a38dddfcd8f91d2108583320b (diff) | |
parent | b54ef9749c083afd86573112fad3b3ed8ee2d0e4 (diff) | |
download | cgit-7710178e45dee61e85ea77c4221309ce8c086f95.zip cgit-7710178e45dee61e85ea77c4221309ce8c086f95.tar.gz cgit-7710178e45dee61e85ea77c4221309ce8c086f95.tar.bz2 |
Merge branch 'lh/stats'
Conflicts:
cgit.c
cgit.css
cgit.h
ui-tree.c
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -90,6 +90,7 @@ OBJECTS += ui-refs.o | |||
90 | OBJECTS += ui-repolist.o | 90 | OBJECTS += ui-repolist.o |
91 | OBJECTS += ui-shared.o | 91 | OBJECTS += ui-shared.o |
92 | OBJECTS += ui-snapshot.o | 92 | OBJECTS += ui-snapshot.o |
93 | OBJECTS += ui-stats.o | ||
93 | OBJECTS += ui-summary.o | 94 | OBJECTS += ui-summary.o |
94 | OBJECTS += ui-tag.o | 95 | OBJECTS += ui-tag.o |
95 | OBJECTS += ui-tree.o | 96 | OBJECTS += ui-tree.o |