diff options
| author |  Barrucadu <mike@barrucadu.co.uk> | 2009-04-26 14:17:12 +0100 |
|---|---|---|
| committer | Barrucadu <mike@barrucadu.co.uk> | 2009-04-26 14:17:12 +0100 |
| commit | b5067190845cf16a12d14c0fedc5e33a17a0c2c6 (patch) | |
| tree | e9d974d0cd96df025f0ee04450738c9b538fe311 /sampleconfig | |
| parent | 9474bb8edd588e458dff418e5aaec44cc735f851 (diff) | |
| parent | 8fd8038469121da41fa8d436dcc47a8fe2f31a63 (diff) | |
Merge branch 'master' of git://github.com/dusanx/uzbl into dusanx/master
Conflicts:
AUTHORS
uzbl.c
Diffstat (limited to 'sampleconfig')
0 files changed, 0 insertions, 0 deletions