From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001
From: strangerke
Date: Thu, 12 May 2011 01:13:57 +0200
Subject: GIT: Clean up: Suppress SVN tags, now useless

---
 gui/gui-manager.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'gui/gui-manager.cpp')

diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 19ca66b7b1..ef2f89df9c 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -17,9 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 #include "common/events.h"
-- 
cgit v1.2.3


From eea482fa4304cab0e23ca4abffdec3651e45f01d Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 25 May 2011 10:31:37 -0400
Subject: ALL: behaviour -> behavior

---
 gui/gui-manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui/gui-manager.cpp')

diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index ef2f89df9c..f56a9097d5 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -297,7 +297,7 @@ void GuiManager::runLoop() {
 			// dialog-related events since they were probably generated while the old dialog
 			// was still visible, and therefore not intended for the new one.
 			//
-			// This hopefully fixes strange behaviour/crashes with pop-up widgets. (Most easily
+			// This hopefully fixes strange behavior/crashes with pop-up widgets. (Most easily
 			// triggered in 3x mode or when running ScummVM under Valgrind.)
 			if (activeDialog != getTopDialog() && event.type != Common::EVENT_SCREEN_CHANGED)
 				continue;
-- 
cgit v1.2.3