about summary refs log tree commit diff stats
path: root/ui-ssdiff.c
diff options
context:
space:
mode:
authorLars Hjemli2009-07-25 12:29:22 +0200
committerLars Hjemli2009-07-25 12:29:22 +0200
commit286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch)
treeec4a3bff9e0a47f1def3cebd2cd2212406df258a /ui-ssdiff.c
parentMerge branch 'ml/head-include' (diff)
parentcgit.h: keep config flags sorted (diff)
downloadcgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.gz
cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.zip
Merge branch 'lh/embedded'
Conflicts:
	cgitrc.5.txt
	ui-shared.c
Diffstat (limited to 'ui-ssdiff.c')
0 files changed, 0 insertions, 0 deletions