From: Daniel Carl Date: Sat, 23 May 2015 19:03:17 +0000 (+0200) Subject: Merge branch 'master' of https://github.com/jasonwryan/vimb X-Git-Url: https://git.owens.tech/projects.html/projects.html/git?a=commitdiff_plain;h=01c9581a325fe3e1323e76f7372a95b651bbff95;p=vimb.git Merge branch 'master' of https://github.com/jasonwryan/vimb Conflicts: README.md --- 01c9581a325fe3e1323e76f7372a95b651bbff95 diff --cc README.md index 60ee05f,12c32ee..0944100 --- a/README.md +++ b/README.md @@@ -42,13 -42,13 +42,14 @@@ the project page of [Vimb][] On Ubuntu these dependencies can be installed by `sudo apt-get install libsoup2.4-dev libwebkit-dev libgtk-3-dev libwebkitgtk-3.0-dev`. - ## install + ## Install - Edit config.mk to match your local setup. + Edit `config.mk` to match your local setup. -Edit `config.h` to match your personal preferences. +Edit src/config.h to match your personal preferences. ++Edit `src/config.h` to match your personal preferences. - The default Makefile will not overwrite your customised `config.h` with the + The default `Makefile` will not overwrite your customised `config.h` with the contents of `config.def.h`, even if it was updated in the latest git pull. Therefore, you should always compare your customised `config.h` with `config.def.h` and make sure you include any changes to the latter in your