Merge pull request #627 from adobe/master

Moving to release branch for Brackets 1.12

appshell/mac/Info.plist

@@ -19,9 +19,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.11.0</string>
+	<string>1.12.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.11.0</string>
+	<string>1.12.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

appshell/version.rc

@@ -31,7 +31,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    	1,11,0,0
+FILEVERSION    	1,12,0,0
 /* PRODUCTVERSION 	1,0,0,0 */
 FILEOS         	VOS__WINDOWS32
 FILETYPE       	VFT_APP
@@ -42,7 +42,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",      "brackets.io\0"
             VALUE "FileDescription",  "\0"
-            VALUE "FileVersion",      "Release 1.11.0\0"
+            VALUE "FileVersion",      "Release 1.12.0\0"
             VALUE "ProductName",      APP_NAME "\0"
             VALUE "ProductVersion",   "\0"
             VALUE "LegalCopyright",   "(c) 2012 Adobe Systems, Inc.\0"

appshell/version_linux.h

@@ -1 +1 @@
-#define APP_VERSION "1.11.0.0"
+#define APP_VERSION "1.12.0.0"

installer/mac/buildInstaller.sh

@@ -2,7 +2,7 @@
 
 # config
 releaseName="Brackets"
-version="1.11"
+version="1.12"
 dmgName="${releaseName} Release ${version}"
 format="bzip2"
 encryption="none"

installer/win/brackets-win-install-build.xml

@@ -12,7 +12,7 @@ default="build.mul">
   <!-- See also: product name definitions in Brackets_<locale>.wxl -->
   <property name="product.shortname" value="Brackets"/>
   <property name="product.release.number.major" value="1"/>
-  <property name="product.release.number.minor" value="11"/>
+  <property name="product.release.number.minor" value="12"/>
   <property name="product.version.number" value="${product.release.number.major}.${product.release.number.minor}"/>
   <property name="product.version.name" value="Release ${product.version.number}"/>
   <property name="product.fullname" value="Brackets ${product.version.name}"/>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "Brackets-Shell",
-    "version": "1.11.0-0",
+    "version": "1.12.0-0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets-shell/issues"