Merge branch 'master' of ssh://rexy712-server:1995/var/git/repos/rexy712/thinkpad_backlight

CMakeLists.txt

@@ -24,7 +24,7 @@ if(PYTHONINTERP_FOUND)
 	add_custom_command(
 		OUTPUT ${GIT_VERSION_TMP_FILE}
 		COMMAND ${CMAKE_COMMAND} -E echo "//File generated by CMake. Do not edit!" > ${GIT_VERSION_TMP_FILE}
-		COMMAND ${CMAKE_COMMAND} -E echo "#define GIT_TAG_NAME \"v1.5.2\"" > ${GIT_VERSION_TMP_FILE}
+		COMMAND ${CMAKE_COMMAND} -E echo "#define GIT_TAG_NAME \"v1.5.3\"" > ${GIT_VERSION_TMP_FILE}
 		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GIT_VERSION_TMP_FILE} ${GIT_VERSION_FILE}
 		COMMAND ${CMAKE_COMMAND} -E remove ${GIT_VERSION_TMP_FILE}
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -35,7 +35,7 @@ elseif(UNIX)
 	add_custom_command(
 		OUTPUT ${GIT_VERSION_TMP_FILE}
 		COMMAND ${CMAKE_COMMAND} -E echo "//File generated by CMake. Do not edit!" > ${GIT_VERSION_TMP_FILE}
-		COMMAND ${CMAKE_COMMAND} -E echo "#define GIT_TAG_NAME \"v1.5.2\"" > ${GIT_VERSION_TMP_FILE}
+		COMMAND ${CMAKE_COMMAND} -E echo "#define GIT_TAG_NAME \"v1.5.3\"" > ${GIT_VERSION_TMP_FILE}
 		COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GIT_VERSION_TMP_FILE} ${GIT_VERSION_FILE}
 		COMMAND ${CMAKE_COMMAND} -E remove ${GIT_VERSION_TMP_FILE}
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}

src/restore.c

@@ -77,7 +77,7 @@ RJP_value* read_restore_file(const char* file){
 	i = fread(file_contents, filesize, 1, fp);
 	fclose(fp);
 	file_contents[filesize] = 0;
-	RJP_value* root = rjp_parse(file_contents, RJP_PARSE_NO_EXT, NULL);
+	RJP_value* root = rjp_parse(file_contents, RJP_PARSE_ALLOW_COMMENTS, NULL);
 	free(file_contents);
 	return root;
 }