diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 12:29:22 +0200 |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-25 12:29:22 +0200 |
| commit | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (patch) | |
| tree | ec4a3bff9e0a47f1def3cebd2cd2212406df258a /.gitignore | |
| parent | 542f6a433034935a1aa895f7ef3273968915a5d1 (diff) | |
| parent | 7a8b3b4104aa5924163efd5f2af0de10b7fb5171 (diff) | |
Merge branch 'lh/embedded'
Conflicts: cgitrc.5.txt ui-shared.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions