diff options
| author |  Mason Larobina <mason.larobina@gmail.com> | 2009-11-11 18:54:11 +0800 |
|---|---|---|
| committer | Mason Larobina <mason.larobina@gmail.com> | 2009-11-11 18:54:11 +0800 |
| commit | 8fc228378306fd809305b95bf5a7eea29211aa77 (patch) | |
| tree | b352fb66f524816d496b8d073109170a0416346e /examples/data/uzbl/scripts | |
| parent | f21741d8a9cf0297e07a94883bb776bbde1c9da9 (diff) | |
| parent | 8d35b85b0bc2ed1fb429d08d6a77ca1a1a038f7a (diff) | |
Resolve uzbl-browser conflicts.
Diffstat (limited to 'examples/data/uzbl/scripts')
| -rwxr-xr-x | examples/data/uzbl/scripts/uzbl-cookie-daemon (renamed from examples/data/uzbl/scripts/cookie_daemon.py) | 0 | ||||
| -rwxr-xr-x | examples/data/uzbl/scripts/uzbl-event-manager (renamed from examples/data/uzbl/scripts/event_manager.py) | 0 | ||||
| -rwxr-xr-x | examples/data/uzbl/scripts/uzbl-tabbed (renamed from examples/data/uzbl/scripts/uzbl_tabbed.py) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/examples/data/uzbl/scripts/cookie_daemon.py b/examples/data/uzbl/scripts/uzbl-cookie-daemon index 87a2e87..87a2e87 100755 --- a/examples/data/uzbl/scripts/cookie_daemon.py +++ b/examples/data/uzbl/scripts/uzbl-cookie-daemon diff --git a/examples/data/uzbl/scripts/event_manager.py b/examples/data/uzbl/scripts/uzbl-event-manager index dee42c5..dee42c5 100755 --- a/examples/data/uzbl/scripts/event_manager.py +++ b/examples/data/uzbl/scripts/uzbl-event-manager diff --git a/examples/data/uzbl/scripts/uzbl_tabbed.py b/examples/data/uzbl/scripts/uzbl-tabbed index bb9b9a2..bb9b9a2 100755 --- a/examples/data/uzbl/scripts/uzbl_tabbed.py +++ b/examples/data/uzbl/scripts/uzbl-tabbed |