| commit | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 | [log] [tgz] |
|---|---|---|
| author | Lars Hjemli <hjemli@gmail.com> | Sat Jul 25 12:29:22 2009 +0200 |
| committer | Lars Hjemli <hjemli@gmail.com> | Sat Jul 25 12:29:22 2009 +0200 |
| tree | ec4a3bff9e0a47f1def3cebd2cd2212406df258a | |
| parent | 542f6a433034935a1aa895f7ef3273968915a5d1 [diff] | |
| parent | 7a8b3b4104aa5924163efd5f2af0de10b7fb5171 [diff] |
Merge branch 'lh/embedded' Conflicts: cgitrc.5.txt ui-shared.c
