aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-12-06 11:37:37 +0100
committerLars Hjemli <hjemli@gmail.com>2008-12-06 11:37:37 +0100
commit3c32fe07717f27fc891b66ccd06057fb810d03ad (patch)
tree04897b3eac6432c43284e7da79161e47856d078b /Makefile
parent9c8be943f72b6f1bda5a31ce401899c3dd734e98 (diff)
parentab67164d6217fcda5ef3e07aefa3dd6eee6b65a3 (diff)
downloadcgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.tar.gz
cgit-3c32fe07717f27fc891b66ccd06057fb810d03ad.tar.bz2
Merge branch 'full-log'
Conflicts: cgit.c cgit.h
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions