To cherry pick, or not to cherry pick - that is the question: whether…

… 'tis nobler in the mind to suffer the slings and arrows of manual updates, oOr to take arms against a sea of bugs, and, by opposing, end them. Undo update.
NREL · Jun 11, 2016 · 458a1f0 · 458a1f0 · nrel-bot-2 · Jun 11, 2016
1 parent 7424abe
commit 458a1f0
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 29,265 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ project(OpenStudio)
 
 set(CMAKE_VERSION_MAJOR 1)
 set(CMAKE_VERSION_MINOR 11)
-set(CMAKE_VERSION_PATCH 6)
+set(CMAKE_VERSION_PATCH 5)
 
 set(CMAKE_VERSION_BUILD "Unknown" CACHE STRING "Build number")
 find_package(Git)

diff --git a/openstudiocore/resources/CMakeLists.txt b/openstudiocore/resources/CMakeLists.txt
@@ -443,9 +443,6 @@ set(osversion_resources_src
   osversion/1_11_4/OpenStudio.idd
   osversion/1_11_4/example.osm
   osversion/1_11_4/example.osc
-  osversion/1_11_5/OpenStudio.idd
-  osversion/1_11_5/example.osm
-  osversion/1_11_5/example.osc
   osversion/unknown.osc
 )
 

diff --git a/openstudiocore/resources/model/OpenStudio.idd b/openstudiocore/resources/model/OpenStudio.idd
@@ -1,4 +1,4 @@
-!IDD_Version 1.11.6
+!IDD_Version 1.11.5
 ! *****************************************************************************
 ! This file is the Input Data Dictionary (IDD) for OpenStudio Model.
 !