Merge branch 'master' into jgrpp

# Conflicts:
#	src/lang/korean.txt
#	src/settings.cpp

src/video/video_driver.hpp

@@ -33,6 +33,7 @@ extern std::vector<Dimension> _resolutions;
 extern Dimension _cur_resolution;
 extern bool _rightclick_emulate;
 extern bool _video_hw_accel;
+extern bool _video_vsync;
 
 /** The base of all video drivers. */
 class VideoDriver : public Driver {
@@ -71,6 +72,12 @@ public:
 	 */
 	virtual bool ToggleFullscreen(bool fullscreen) = 0;
 
+	/**
+	 * Change the vsync setting.
+	 * @param vsync The new setting.
+	 */
+	virtual void ToggleVsync(bool vsync) {}
+
 	/**
 	 * Callback invoked after the blitter was changed.
 	 * @return True if no error.