Merge branch 'release-1-0-beta10' into dev-1.0-releases

RequestPolicyContinued · Jul 1, 2015 · 48bda95 · 48bda95
2 parents 631b524 + 4fcfd9f
commit 48bda95
Show file tree

Hide file tree

Showing 138 changed files with 2,488 additions and 784 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,9 @@
 *.xpi
 *.bak*
 *.orig
+*.pyc
+
+gecko.log
 
 # build and dist directories in the root folder
 /build/

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,6 +3,13 @@
 Note: ChangeLogs for the source code and unit tests, both not relevant for
       users, you can find in the dedicated subdirectories.
 
+#### Version 1.0.beta10
+* The extension ID has changed (#609). It has to be taken care that
+  different versions of RequestPolicy aren't installed at the same time.
+  When upgrading from an older version there shouldn't be any problems though.
+* updated translation (eu, zh-CN)
+
+
 #### Version 1.0.beta9.3 (bugfix)
 * it was not possible to import rules from RequestPolicy 0.5.x
   Old rules can now be imported on `about:requestpolicy?oldrules`.