[Scummvm-cvs-logs] scummvm master -> a8518eebe6632d7632ee204799bd8ff76eb01384

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a8518eebe6 Revert "WINTERMUTE: Remove extra semicolon."


Commit: a8518eebe6632d7632ee204799bd8ff76eb01384
    https://github.com/scummvm/scummvm/commit/a8518eebe6632d7632ee204799bd8ff76eb01384
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-09-04T10:51:33-07:00

Commit Message:
Revert "WINTERMUTE: Remove extra semicolon."

This reverts commit 9989a4f3daba891326810d7ae620cd75d97521f1.
Note: Don't blind fix warnings of broken builds.

Conflicts:
	engines/wintermute/base/base_keyboard_state.cpp

Changed paths:
    engines/wintermute/base/base_keyboard_state.cpp



diff --git a/engines/wintermute/base/base_keyboard_state.cpp b/engines/wintermute/base/base_keyboard_state.cpp
index c8a6ccd..d5c2027 100644
--- a/engines/wintermute/base/base_keyboard_state.cpp
+++ b/engines/wintermute/base/base_keyboard_state.cpp
@@ -277,7 +277,7 @@ enum VKeyCodes {
 	kVkUp    = 38,

 	kVkRight = 39,

 	kVkDown  = 40

-}

+};

 

 //////////////////////////////////////////////////////////////////////////

 Common::KeyCode BaseKeyboardState::vKeyToKeyCode(uint32 vkey) {