Merge branch 'master' into hle-interface

3 files changed, 18 insertions, 21 deletions

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index c4f060db0..6cf0e61c8 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,18 +1,19 @@
-set(SRCS    src/break_points.cpp
-            src/console_listener.cpp
-            src/extended_trace.cpp
-            src/file_search.cpp
-            src/file_util.cpp
-            src/hash.cpp
-            src/log_manager.cpp
-            src/math_util.cpp
-            src/mem_arena.cpp
-            src/memory_util.cpp
-            src/misc.cpp
-            src/msg_handler.cpp
-            src/string_util.cpp
-            src/thread.cpp
-            src/timer.cpp
-            src/version.cpp)
+set(SRCS    break_points.cpp
+            console_listener.cpp
+            extended_trace.cpp
+            file_search.cpp
+            file_util.cpp
+            hash.cpp
+            log_manager.cpp
+            math_util.cpp
+            mem_arena.cpp
+            memory_util.cpp
+            misc.cpp
+            msg_handler.cpp
+            string_util.cpp
+            thread.cpp
+            timer.cpp
+            utf8.cpp
+            version.cpp)
 
 add_library(common STATIC ${SRCS})
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index 731784756..e70b99ec1 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -55,7 +55,7 @@ public:
         m_client_area_height = val;
     }
 
-    std::string GetWindowTitle() { 
+    std::string GetWindowTitle() const { 
         return m_window_title;
     }
     
diff --git a/src/common/scm_rev.h b/src/common/scm_rev.h
deleted file mode 100644
index cd5df9ca8..000000000
--- a/src/common/scm_rev.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define SCM_REV_STR "d0674cc98bfa5729168274cde62a4e69343f8524"
-#define SCM_DESC_STR "d0674cc"
-#define SCM_BRANCH_STR "master"
-#define SCM_IS_MASTER 1