Merge branch 'master' into standalone

2014-01-09 08:02:20 -08:00 · 2014-01-09 08:02:20 -08:00 · d50c319175
commit d50c319175
parent 4cabe075d5 24d0c173a0
2 changed files with 2 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,12 +1,6 @@
-resources/openpgpjs.pem
 build/
 .DS_Store
 node_modules/
 npm*
 test/lib/
-resources/keyring_nodebug.js
-resources/openpgp_nodebug.js
-resources/keyring.js
-resources/keyring.min.js
-resources/openpgp.js
-resources/openpgp.min.js
+dist/
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ You can also build a current version yourself:

    npm install && grunt

-Then take the resulting file from `resources/openpgp.min.js` to use in your project.
+Then take `dist/openpgp.min.js` to use in your project.

 # I need some help
 ## Mailing List