]> granicus.if.org Git - cgit/commitdiff
projects / cgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5807fb7 aabc70f)
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Sun, 7 Nov 2010 15:25:23 +0000 (16:25 +0100)
committerLars Hjemli <hjemli@gmail.com>
Sun, 7 Nov 2010 15:25:23 +0000 (16:25 +0100)
Conflicts:
scan-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.