[Pkg-mozext-commits] [requestpolicy] 02/257: Merge branch 'release-1-0-beta10' into dev-1.0

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit fe3716d00ac5e63b7fac9ba6fbb8ca84dee52c88
Merge: cd05609 4fcfd9f
Author: Martin Kimmerle <dev at 256k.de>
Date:   Wed Jul 1 20:37:03 2015 +0200

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

 ChangeLog.md                              |  7 +++++++
 Makefile                                  |  6 +++++-
 src/SourceCode-ChangeLog.md               | 15 +++++++++++++++
 src/content/settings/setup.html           |  5 +----
 src/install.rdf                           |  6 +++---
 src/locale/ja/requestpolicy.properties    |  2 +-
 src/locale/zh-CN/requestpolicy.properties |  2 +-
 tests/UnitTest-ChangeLog.md               |  5 +++++
 8 files changed, 38 insertions(+), 10 deletions(-)

diff --cc src/install.rdf
index 0d79207,b0c60e6..946c2c7
--- a/src/install.rdf
+++ b/src/install.rdf
@@@ -4,8 -4,8 +4,8 @@@
    xmlns:em="http://www.mozilla.org/2004/em-rdf#">
  
    <Description about="urn:mozilla:install-manifest">
-     <em:name>RequestPolicy Continued</em:name>
+     <em:name>RequestPolicy Continued Beta</em:name>
 -    <em:version>1.0.beta10</em:version>
 +    <em:version>1.0.dev</em:version>
      <em:type>2</em:type>
      <em:id>rpcontinued at non-amo.requestpolicy.org</em:id>
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git