diff options
| author |  Premysl 'Anydot' Hruby <dfenze@gmail.com> | 2009-04-30 17:37:46 +0200 |
|---|---|---|
| committer | Premysl 'Anydot' Hruby <dfenze@gmail.com> | 2009-04-30 17:37:46 +0200 |
| commit | 4e9ce3acd8c3d13d2276ac84300e358c8fddc7ea (patch) | |
| tree | 6e0633e810d74b504677dd6b5babd534c6336d8a /examples | |
| parent | 092201fa92e498a8bcc6fc824fcf179adc8c43fa (diff) | |
| parent | b3b92d1fa68aaca611acc434338f602f25d5e44c (diff) | |
Merge commit 'origin/master' into HEAD
Conflicts:
examples/configs/sampleconfig
examples/configs/sampleconfig-dev
uzbl.c
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/configs/sampleconfig | 36 | ||||
| -rw-r--r-- | examples/configs/sampleconfig-dev | 36 |
2 files changed, 34 insertions, 38 deletions
diff --git a/examples/configs/sampleconfig b/examples/configs/sampleconfig index 9796859..4cba098 100644 --- a/examples/configs/sampleconfig +++ b/examples/configs/sampleconfig @@ -21,24 +21,22 @@ show_status = 1 status_top = 0 home_page = http://www.uzbl.org -[bindings_internal] -back = b -forward = m -stop = s -refresh = r -reload = R -home = h -follow_link_here = f -follow_link_new_tab = F -follow_link_new_window = w -zoom_in = + -zoom_out = - -toggle_status = t -exit = k - -[bindings_external] -/bin/bash /usr/share/uzbl/examples/scripts/insert_bookmark.sh = B -/bin/bash /usr/share/uzbl/examples/scripts/load_url_from_history.sh = u -/bin/bash /usr/share/uzbl/examples/scripts/load_url_from_bookmarks.sh = U +[bindings] +b = back +m = forward +s = stop +r = refresh +R = reload +h = home +f = follow_link_here +F = follow_link_new_tab +w = follow_link_new_window ++ = zoom_in +- = zoom_out +t = toggle_status +k = exit +B = spawn /bin/bash /usr/share/uzbl/examples/scripts/insert_bookmark.sh +u = spawn /bin/bash /usr/share/uzbl/examples/scripts/load_url_from_history.sh +U = spawn /bin/bash /usr/share/uzbl/examples/scripts/load_url_from_bookmarks.sh [network] diff --git a/examples/configs/sampleconfig-dev b/examples/configs/sampleconfig-dev index d742147..9413732 100644 --- a/examples/configs/sampleconfig-dev +++ b/examples/configs/sampleconfig-dev @@ -21,24 +21,22 @@ show_status = 1 status_top = 0 home_page = http://www.uzbl.org -[bindings_internal] -back = b -forward = m -stop = s -refresh = r -reload = R -home = h -follow_link_here = f -follow_link_new_tab = F -follow_link_new_window = w -zoom_in = + -zoom_out = - -toggle_status = t -exit = k - -[bindings_external] -/bin/bash ./examples/scripts/insert_bookmark.sh = B -/bin/bash ./examples/scripts/load_url_from_history.sh = u -/bin/bash ./examples/scripts/load_url_from_bookmarks.sh = U +[bindings] +b = back +m = forward +s = stop +r = refresh +R = reload +h = home +f = follow_link_here +F = follow_link_new_tab +w = follow_link_new_window ++ = zoom_in +- = zoom_out +t = toggle_status +k = exit +B = spawn /bin/bash ./examples/scripts/insert_bookmark.sh +u = spawn /bin/bash ./examples/scripts/load_url_from_history.sh +U = spawn /bin/bash ./examples/scripts/load_url_from_bookmarks.sh [network] |