Merge branch 'master' into develop

Author: macumber

CMakeLists.txt

@@ -272,7 +272,11 @@ endif()
 
 # TODO: Modify the more specific variables as needed to indicate prerelease, etc
 # Keep in beta in-between release cycles. Set to empty string (or comment out) for official)
+<<<<<<< develop
 set(PROJECT_VERSION_PRERELEASE "")
+=======
+set(PROJECT_VERSION_PRERELEASE "rc2")
+>>>>>>> master
 
 # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag
 set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")