summaryrefslogtreecommitdiffabout
path: root/Makefile
authorLars Hjemli <hjemli@gmail.com>2009-07-25 10:29:22 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-07-25 10:29:22 (UTC)
commit286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch) (side-by-side diff)
treeec4a3bff9e0a47f1def3cebd2cd2212406df258a /Makefile
parent542f6a433034935a1aa895f7ef3273968915a5d1 (diff)
parent7a8b3b4104aa5924163efd5f2af0de10b7fb5171 (diff)
downloadcgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.zip
cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.gz
cgit-286a905842dc0bec6d21a614ec4a97c5f19d5bc4.tar.bz2
Merge branch 'lh/embedded'
Conflicts: cgitrc.5.txt ui-shared.c
Diffstat (limited to 'Makefile') (more/less context) (ignore whitespace changes)
0 files changed, 0 insertions, 0 deletions