3 files changed, 12 insertions, 6 deletions
diff --git a/find_java/find_java.bat b/find_java/find_java.bat
index 0ee00e5..6355f23 100755
--- a/find_java/find_java.bat
+++ b/find_java/find_java.bat
@@ -41,6 +41,10 @@ echo Tools, you need a suitable version of Java JDK installed on your system.
 echo We recommend that you install the JDK version of JavaSE, available here:
 echo   http://www.oracle.com/technetwork/java/javase/downloads
 echo.
+echo If you already have Java installed, you can define the JAVA_HOME environment
+echo variable in Control Panel / System / Avanced System Settings to point to the
+echo JDK folder.
+echo.
 echo You can find the complete Android SDK requirements here:
 echo   http://developer.android.com/sdk/requirements.html
 echo.
diff --git a/find_java/find_java.h b/find_java/find_java.h
index 0a61e73..1181aa1 100755
--- a/find_java/find_java.h
+++ b/find_java/find_java.h
@@ -21,9 +21,9 @@
 
 #include "utils.h"
 
-// We currently search for a Java version for at least 1.5
+// We currently search for a Java version for at least 1.6
 #define MIN_JAVA_VERSION_MAJOR 1
-#define MIN_JAVA_VERSION_MINOR 5
+#define MIN_JAVA_VERSION_MINOR 6
 #define MIN_JAVA_VERSION (MIN_JAVA_VERSION_MAJOR * 1000 + MIN_JAVA_VERSION_MINOR)
 
 
diff --git a/find_java/find_java.sln b/find_java/find_java.sln
index 17c3228..ec14173 100755
--- a/find_java/find_java.sln
+++ b/find_java/find_java.sln
@@ -7,16 +7,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindJavaExe", "find_java_ex
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FindLock", "..\find_lock\find_lock_exe.vcproj", "{42701EC1-6226-47FD-8817-57A3DEC7A1E2}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SdkLauncher", "..\sdklauncher\sdklauncher.vcproj", "{331EADA4-DC19-429D-AAD0-5B9632B4CBC1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}.Debug|Win32.Build.0 = Debug|Win32
-		{5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}.Release|Win32.ActiveCfg = Release|Win32
-		{5E3E2AFD-1D6B-4997-A9B5-8ECBC8F6C31A}.Release|Win32.Build.0 = Release|Win32
 		{D194C98B-3FA4-4DAB-908A-16C03C15EC35}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D194C98B-3FA4-4DAB-908A-16C03C15EC35}.Debug|Win32.Build.0 = Debug|Win32
 		{D194C98B-3FA4-4DAB-908A-16C03C15EC35}.Release|Win32.ActiveCfg = Release|Win32
@@ -29,6 +27,10 @@ Global
 		{42701EC1-6226-47FD-8817-57A3DEC7A1E2}.Debug|Win32.Build.0 = Debug|Win32
 		{42701EC1-6226-47FD-8817-57A3DEC7A1E2}.Release|Win32.ActiveCfg = Release|Win32
 		{42701EC1-6226-47FD-8817-57A3DEC7A1E2}.Release|Win32.Build.0 = Release|Win32
+		{331EADA4-DC19-429D-AAD0-5B9632B4CBC1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{331EADA4-DC19-429D-AAD0-5B9632B4CBC1}.Debug|Win32.Build.0 = Debug|Win32
+		{331EADA4-DC19-429D-AAD0-5B9632B4CBC1}.Release|Win32.ActiveCfg = Release|Win32
+		{331EADA4-DC19-429D-AAD0-5B9632B4CBC1}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE