Merge branch 'pks/acceleration-settings' of https://github.com/pks-t/vimb into webkit2
authorDaniel Carl <danielcarl@gmx.de>
Sat, 20 May 2017 22:01:06 +0000 (00:01 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Sat, 20 May 2017 22:01:06 +0000 (00:01 +0200)
1  2 
src/setting.c

diff --cc src/setting.c
Simple merge