Merge branch 'workshop' into RB-2.0

MrKepzie · Sep 25, 2015 · d3d74fe · d3d74fe
2 parents 24c847c + f6ffaeb
commit d3d74fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,9 @@
 - New merge operators: grain-extract, grain-merge, color, hue, luminosity
 - New gamma and gain controllers on the viewer
 - Multiple viewers can now have their projection synchronised to enhance image comparison
+- Support for multi-layered workflows for cleaner graphs
+- Better support for multi-view workflows
+- Various performance and stability enhancements across the board 
 
 ## Version 1.2.1
 

diff --git a/Global/Macros.h b/Global/Macros.h
@@ -87,7 +87,7 @@
 ///For example RC 1, RC 2 etc...
 #define NATRON_BUILD_NUMBER 1
 
-#define NATRON_LAST_VERSION_URL "https://raw.githubusercontent.com/MrKepzie/Natron/master/LATEST_VERSION.txt"
+#define NATRON_LAST_VERSION_URL "https://raw.githubusercontent.com/MrKepzie/Natron/workshop/LATEST_VERSION.txt"
 #define NATRON_LAST_VERSION_FILE_VERSION 1
 
 // homemade builds should always show "Devel"