diff options
author | Mason Larobina <mason.larobina@gmail.com> | 2009-09-30 19:44:41 +0800 |
---|---|---|
committer | Mason Larobina <mason.larobina@gmail.com> | 2009-09-30 19:44:41 +0800 |
commit | 0a16d0be71a258e8284e5d4c398f4439757e9ddc (patch) | |
tree | abfc4718377203642587c4500cb544069b8dc181 /AUTHORS | |
parent | 8aa9fba72378f2db43d5f8b756217e31716efa0b (diff) | |
parent | 69cc7552aa64e0e64f5f4df751871eb9ae663e28 (diff) |
Merge branch 'commandline-editing' of git://github.com/keis/uzbl into experimental
Conflicts:
examples/data/uzbl/scripts/plugins/keycmd.py
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions