Diverge from 1.5.x

AcademySoftwareFoundation · Jul 15, 2014 · 77ef987 · 77ef987
1 parent 7dfb9fe
commit 77ef987
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,17 @@
+Changes:
+
+Release 1.6 -- in development (compared to 1.5)
+-----------------------------------------------
+Language, standard libary, and compiler changes (for shader writers):
+API changes, new options, new ShadingSystem features (for renderer writers):
+Performance improvements:
+Bug fixes:
+Under the hood:
+Build & test system improvements and developer goodies:
+Documentation:
+
+
+
 Release 1.5 -- Release candidate July 15, 2014 (compared to 1.4)
 ----------------------------------------------
 Language, standard libary, and compiler changes (for shader writers):

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,9 +2,9 @@ project (OSL)
 
 # Release version of the library
 set (OSL_LIBRARY_VERSION_MAJOR 1)
-set (OSL_LIBRARY_VERSION_MINOR 5)
-set (OSL_LIBRARY_VERSION_PATCH 8)
-set (OSL_LIBRARY_VERSION_RELEASE_TYPE "RC1")   # "dev", "betaX", "RCY", ""
+set (OSL_LIBRARY_VERSION_MINOR 6)
+set (OSL_LIBRARY_VERSION_PATCH 0)
+set (OSL_LIBRARY_VERSION_RELEASE_TYPE "dev")   # "dev", "betaX", "RCY", ""
 
 # Version of the OSO file format and instruction set
 set (OSO_FILE_VERSION_MAJOR 1)

diff --git a/src/doc/languagespec.tex b/src/doc/languagespec.tex
@@ -43,7 +43,7 @@
 
 \def\langname{Open Shading Language\xspace}
 \def\product{{\sffamily Open Shading Language}\xspace}
-\def\versionnumber{1.5}
+\def\versionnumber{1.6}
 \def\productver{\product\ {\sffamily \versionnumber}\xspace}