diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2011-07-12 21:19:37 +0000 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2011-07-12 21:19:37 +0000 |
| commit | fc9604fa60645fe7c6129a76bee273bb501b88e6 (patch) | |
| tree | 0d6e7122796b62e49a2b0db978350c402c560f21 /README | |
| parent | 57b6e5af1ace03e4ee13903cee881464ee051d24 (diff) | |
| parent | ff2ddbd300e5c3d3ddf0aaf4f4a16850ca9c8370 (diff) | |
Merge branch 'master' into experimental
Conflicts:
src/uzbl-core.c
I accidentally merged a pull request into master, getting everything
synced up again.
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions