small readme fix
Merge branch 'master' of https://github.com/jcline/VideoCrumb
Merge branch 'master' of https://github.com/jcline/VideoCrumb
Merge branch 'master' of https://github.com/jcline/VideoCrumb
Merge branch 'master' of https://github.com/jcline/VideoCrumb
Merge branch 'master' of https://github.com/jcline/VideoCrumb
Merge branch 'master' of https://github.com/jcline/VideoCrumb
forgot to actually set config and data
- Decrement times watched added
- Fixed update shows watched for 'w' and 'u'
Merge pull request #1 from kasaharas/master

Decrementing and updating for shows
Merge pull request #2 from weeabros/master

airen-thingies~
spacing fix
add more control documentation
document a couple more control features
Added removing shows feature and minor bug fix
- Implemented deleteselected in PlaylistController.cpp
- Added del() in ShowsWindow.cpp
- Added getdispoffset() in PlaylistController.cpp
- Added check for empty list for deleting playlists
Merge pull request #20 from kasaharas/master

Added removing shows feature and minor bug fix
Fixed typo from --data-dir to --data_dir
Settings: Fallback to ~/.config and ~/.local/share
Merge branch 'master' of github.com:jcline/VideoCrumb

Conflicts:
	SettingsController.cpp
Settings: Style fix and make sure we use XDG_CONFIG_HOME