Merge branch 'master' into prashant/cef-upgrade-latest

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2014 Adobe Systems Incorporated. All rights reserved.
+Copyright (c) 2012 - present Adobe Systems Incorporated. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"), 

appshell/mac/Info.plist

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

appshell/version.rc

@@ -32,7 +32,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    	1,6,0,0
+FILEVERSION    	1,7,0,0
 /* PRODUCTVERSION 	1,0,0,0 */
 FILEOS         	VOS__WINDOWS32
 FILETYPE       	VFT_APP
@@ -43,7 +43,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",      "brackets.io\0"
             VALUE "FileDescription",  "\0"
-            VALUE "FileVersion",      "Release 1.6.0\0"
+            VALUE "FileVersion",      "Release 1.7.0\0"
             VALUE "ProductName",      APP_NAME "\0"
             VALUE "ProductVersion",   "\0"
             VALUE "LegalCopyright",   "(c) 2012 Adobe Systems, Inc.\0"

installer/mac/buildInstaller.sh

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

installer/win/Brackets.wxs

@@ -50,7 +50,7 @@
                            Value="SOFTWARE\$(var.RegistryRoot)\Capabilities" Type="string" />
 
             <!-- File associations -->
-            <?define SupportedFiletypes=txt;groovy;ini;properties;css;scss;html;htm;shtm;shtml;xhtml;cfm;cfm1;cfc;dhtml;xht;tpl;twig;hbs;handlebars;kit;jsp;aspx;ejs;js;jsx;json;svg;xml;wxs;wxl;wsdl;rss;atom;rdf;xslt;xul;xbl;mathml;config;php;php3;php4;php5;phtm;phtml;ctp;c;h;i;cc;cp;cpp;c++;cxx;hh;hpp;hxx;h++;ii;cs;cshtml;asax;ashx;java;scala;sbt;coffee;cson;cf;clj;pl;pm;rb;ru;gemspec;rake;py;pyw;wsgi;sass;less;lua;sql;diff;patch;md;markdown;yaml;yml;hx;sh?>
+            <?define SupportedFiletypes=css;scss;html;htm;shtm;shtml;xhtml;cfm;cfm1;cfc;dhtml;xht;tpl;twig;hbs;handlebars;kit;jsp;aspx;ejs;js;jsx;json;svg;xml;rss;atom;rdf;xslt;xul;xbl;mathml;php;php3;php4;php5;phtm;phtml;ctp;cshtml;asax;ashx;coffee;cson;cf;clj;wsgi;sass;less;sql;diff;patch;md;markdown;yaml;yml;hx?>
 
             <?foreach filetype in $(var.SupportedFiletypes)?>
                 <!-- associate program with file type -->

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="6"/>
+  <property name="product.release.number.minor" value="7"/>
   <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.6.0-0",
+    "version": "1.7.0-0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets-shell/issues"
@@ -28,4 +28,4 @@
         "install": "",
         "postinstall": "bash -c 'mv .appshell.gyp appshell.gyp;'"
     }
-}
+}