Merge tag '5.0.0'

jsha · jsha · commit e6ecc7b50ad9 · 2015-03-31T12:27:03.000-07:00
5.0.0
diff --git a/chromium/manifest.json b/chromium/manifest.json
@@ -21,7 +21,7 @@
         "16": "icon16.png", 
         "48": "icon48.png"
     }, 
-    "incognito": "split",
+    "incognito": "split", 
     "manifest_version": 2, 
     "minimum_chrome_version": "18", 
     "name": "__MSG_about_ext_name__", 
@@ -41,5 +41,5 @@
         "<all_urls>"
     ], 
     "update_url": "https://www.eff.org/files/https-everywhere-chrome-updates.xml", 
-    "version": "2015.1.22"
-}
+    "version": "2015.3.23"
+}
diff --git a/src/Changelog b/src/Changelog
@@ -1,3 +1,14 @@
+Firefox 5.0 / Chrome-2015.03.23             (2015-03-23)
+  * First stable 5.0 release
+  Versus 4.0.3:
+  * Many new rulesets.
+  * Improved automated ruleset testing.
+  * Many new translations in Firefox version.
+  * Support for Firefox electrolysis (aka e10s aka process separation).
+
+Firefox 5.0development.4                    (2015-03-20)
+  * Ruleset updates
+
 5.0development.3                            (2015-03-10)
   * Added automated ruleset testing.
   * Disabled many rules that failed ruleset tests.
diff --git a/src/chrome/content/about.xul b/src/chrome/content/about.xul
@@ -21,7 +21,7 @@
 
     <groupbox>
       <caption label="&https-everywhere.about.version;" />
-      <label>5.0development.4</label>
+      <label>5.0</label>
     </groupbox>
     
     <groupbox>
diff --git a/src/install.rdf b/src/install.rdf
@@ -9,7 +9,7 @@
         <em:id>https-everywhere@eff.org</em:id>
         <em:type>2</em:type> <!-- type: Extension -->
         <em:description>Encrypt the Web! Automatically use HTTPS security on many sites.</em:description>
-        <em:version>5.0development.4</em:version>
+        <em:version>5.0</em:version>
         <em:multiprocessCompatible>true</em:multiprocessCompatible>
         <em:homepageURL>https://www.eff.org/https-everywhere</em:homepageURL>
         <em:optionsURL>chrome://https-everywhere/content/meta-preferences.xul</em:optionsURL>
