modified:   src/player/input/x_pl_input.cpp
	modified:   src/player/misc/x_pl_control.cpp
	modified:   src/ui/vs_plugins/pl_jo/JoPlayer.cpp
Merge branch 'master' of https://github.com/joorhy/jorhy-prj