Merge branch 'blyxxyz-master'

This commit is contained in:
Florian Bruhin 2016-04-20 17:49:31 +02:00
commit a6f496dc2a
2 changed files with 6 additions and 5 deletions

View File

@ -199,6 +199,7 @@ Contributors, sorted by the number of commits in descending order:
* Regina Hug * Regina Hug
* Mathias Fussenegger * Mathias Fussenegger
* Marcelo Santos * Marcelo Santos
* Jan Verbeek
* Fritz V155 Reichwald * Fritz V155 Reichwald
* Franz Fellner * Franz Fellner
* Corentin Jule * Corentin Jule
@ -222,7 +223,6 @@ Contributors, sorted by the number of commits in descending order:
* Johannes Martinsson * Johannes Martinsson
* Jean-Christophe Petkovich * Jean-Christophe Petkovich
* Jay Kamat * Jay Kamat
* Jan Verbeek
* Helen Sherwood-Taylor * Helen Sherwood-Taylor
* HalosGhost * HalosGhost
* Gregor Pohl * Gregor Pohl

View File

@ -1394,6 +1394,7 @@ KEY_DATA = collections.OrderedDict([
('set-cmd-text -s :open -w', ['wo']), ('set-cmd-text -s :open -w', ['wo']),
('set-cmd-text :open -w {url}', ['wO']), ('set-cmd-text :open -w {url}', ['wO']),
('open -t', ['ga', '<Ctrl-T>']), ('open -t', ['ga', '<Ctrl-T>']),
('open -w', ['<Ctrl-N>']),
('tab-close', ['d', '<Ctrl-W>']), ('tab-close', ['d', '<Ctrl-W>']),
('tab-close -o', ['D']), ('tab-close -o', ['D']),
('tab-only', ['co']), ('tab-only', ['co']),
@ -1401,11 +1402,11 @@ KEY_DATA = collections.OrderedDict([
('tab-move', ['gm']), ('tab-move', ['gm']),
('tab-move -', ['gl']), ('tab-move -', ['gl']),
('tab-move +', ['gr']), ('tab-move +', ['gr']),
('tab-focus', ['J']), ('tab-focus', ['J', '<Ctrl-PgDown>']),
('tab-prev', ['K']), ('tab-prev', ['K', '<Ctrl-PgUp>']),
('tab-clone', ['gC']), ('tab-clone', ['gC']),
('reload', ['r']), ('reload', ['r', '<F5>']),
('reload -f', ['R']), ('reload -f', ['R', '<Ctrl-F5>']),
('back', ['H']), ('back', ['H']),
('back -t', ['th']), ('back -t', ['th']),
('back -w', ['wh']), ('back -w', ['wh']),