Merge branch 'local/global-settings' into feature/downloader
authorDaniel Carl <danielcarl@gmx.de>
Sun, 29 Jun 2014 13:42:13 +0000 (15:42 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Sun, 29 Jun 2014 13:42:13 +0000 (15:42 +0200)
commit9e78de4fd30aafe51871582b4ab372fb79084327
tree133114fab7f412a5d47af4a9cb477a4ac6d09a7a
parentae1b938380da0b90d1d9a48ef2edd6893f4fb79b
parent2ba96b48ff35672fbd44c090cf22c78e7f9a89c4
Merge branch 'local/global-settings' into feature/downloader

Conflicts:
src/main.h
src/setting.c
doc/vimb.1
src/main.c
src/setting.c