# HG changeset patch
# User koda
# Date 1370246744 -7200
# Node ID cba0d21991230592f6b3079e7742ad23077217ae
# Parent  2cdb0ed3813a1b30d8ae6fd0bf029b13de7089f9# Parent  4ae3dd71f5fa9464c43cb1a597ff55a48e2f974f
merge default with .19

diff -r 2cdb0ed3813a -r cba0d2199123 .hgtags
--- a/.hgtags	Fri May 31 14:51:08 2013 -0400
+++ b/.hgtags	Mon Jun 03 10:05:44 2013 +0200
@@ -59,3 +59,4 @@
 0000000000000000000000000000000000000000 0.9.18-release
 0000000000000000000000000000000000000000 0.9.18-release
 2fc02902c7cbf3c29bfe08a50e5f37983582b251 0.9.18-release
+1617149e01a4fa25637e2ab655d0287ef9c21b7c 0.9.19-release
diff -r 2cdb0ed3813a -r cba0d2199123 CMakeLists.txt
--- a/CMakeLists.txt	Fri May 31 14:51:08 2013 -0400
+++ b/CMakeLists.txt	Mon Jun 03 10:05:44 2013 +0200
@@ -24,7 +24,7 @@
 option(NOVIDEOREC "Disable video recording (off)" OFF)
 
 #set this to ON when 2.1.0 becomes more widespread (and only for linux)
-option(SYSTEM_PHYSFS "Use system physfs (off)" OFF)
+option(PHYSFS_SYSTEM "Use system physfs (off)" OFF)
 
 option(BUILD_ENGINE_LIBRARY "Enable hwengine library (off)" OFF)
 option(ANDROID "Enable Android build (off)" OFF)
@@ -315,7 +315,7 @@
 
 
 #physfs discovery
-if (${SYSTEM_PHYSFS})
+if (${PHYSFS_SYSTEM})
     if (NOT PHYSFS_LIBRARY OR NOT PHYSFS_INCLUDE_DIR)
         find_package(PhysFS)
     endif()