Merge pull request #21 from cgeo/master

Merge master to release - Release version 0.33
cgeo · Oct 26, 2015 · fc2338a · fc2338a
2 parents 3bae62b + f5972de
commit fc2338a
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 367 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,9 @@
 # send2cgeo
 
-Script for Mozilla Firefox and Google Chrome browser to send geocaches directly from your browser to c:geo on your phone.
+Script for Mozilla Firefox and Google Chrome browser to [send geocaches directly from your browser to c:geo](http://www.cgeo.org/send2cgeo.html) on your phone.
 
 ## Version management
 
-Changes should be based on the `master` branch.
-Once the changes are validated and ready to release, the changes should be merged to the `release` branch. This merge has to include a raise of the script version number.
+Changes must be done on the `master` branch. Once the changes are validated and ready to release, they can be merged to the `release` branch. The script version number needs to be raised within that merge.
 
-The script download link on the c:geo homepage directly targets the raw script on the `release` branch, which means after merging the changes to `release` users will get the update.
+The script download link on the [c:geo homepage](http://cgeo.org) directly targets the raw script on the `release` branch, which means after merging the changes to `release` users will see the update.
diff --git a/chrome-extension/manifest.json b/chrome-extension/manifest.json
diff --git a/chrome-extension/send2cgeo.48.png b/chrome-extension/send2cgeo.48.png
diff --git a/chrome-extension/send2cgeo.64.png b/chrome-extension/send2cgeo.64.png
diff --git a/chrome-extension/send2cgeo.user.js b/chrome-extension/send2cgeo.user.js
diff --git a/firefox-addon/send2cgeo/data/LICENSE b/firefox-addon/send2cgeo/data/LICENSE
diff --git a/firefox-addon/send2cgeo/data/NOTICE b/firefox-addon/send2cgeo/data/NOTICE
diff --git a/firefox-addon/send2cgeo/data/send2cgeo.48.png b/firefox-addon/send2cgeo/data/send2cgeo.48.png
diff --git a/firefox-addon/send2cgeo/data/send2cgeo.64.png b/firefox-addon/send2cgeo/data/send2cgeo.64.png
diff --git a/firefox-addon/send2cgeo/data/send2cgeo.user.js b/firefox-addon/send2cgeo/data/send2cgeo.user.js
diff --git a/firefox-addon/send2cgeo/lib/main.js b/firefox-addon/send2cgeo/lib/main.js
diff --git a/firefox-addon/send2cgeo/package.json b/firefox-addon/send2cgeo/package.json