]> gitweb.ps.run Git - ps-cgit/commit
Merge branch 'lh/embedded'
authorLars Hjemli <hjemli@gmail.com>
Sat, 25 Jul 2009 10:29:22 +0000 (12:29 +0200)
committerLars Hjemli <hjemli@gmail.com>
Sat, 25 Jul 2009 10:29:22 +0000 (12:29 +0200)
commit286a905842dc0bec6d21a614ec4a97c5f19d5bc4
treeec4a3bff9e0a47f1def3cebd2cd2212406df258a
parent542f6a433034935a1aa895f7ef3273968915a5d1
parent7a8b3b4104aa5924163efd5f2af0de10b7fb5171
Merge branch 'lh/embedded'

Conflicts:
cgitrc.5.txt
ui-shared.c
cgit.c
cgit.h
cgitrc.5.txt
ui-shared.c