summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-06-22 16:16:12 +0200
committerLars Hjemli <hjemli@gmail.com>2010-06-22 16:16:12 +0200
commit6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch)
tree49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /.gitignore
parent37a24e4e39737edaa5cdde501346a65eeb280e63 (diff)
parentd20313e3daf855ee5d4808e050f54614c200d7b1 (diff)
Merge branch 'jh/context-lines'
Conflicts: cgit.c cgit.h
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions