aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Lane <tom@tomlane.me>2012-09-30 17:37:25 +0100
committerTom Lane <tom@tomlane.me>2012-09-30 17:37:25 +0100
commita520cbead193a31bb473e28babc3b47375b2835b (patch)
tree2f71b2aef310f3aeac2a69e617d7f221b9fda710
parenta021851e40d58ab3a85cdf5e8085c10ffe51aa85 (diff)
parentd9acb3da1b22941b65cf84f963fedf96fae9e497 (diff)
downloadimpress.js-a520cbead193a31bb473e28babc3b47375b2835b.tar.gz
fix conflict
-rw-r--r--component.json14
1 files changed, 14 insertions, 0 deletions
diff --git a/component.json b/component.json
index fbce5d7..1fc7cb8 100644
--- a/component.json
+++ b/component.json
@@ -2,4 +2,18 @@
"name": "impress-js",
"version": "0.5.3",
"main": "./js/impress.js",
+ "description": "It's a presentation framework based on the power of CSS3 transforms and transitions in modern browsers and inspired by the idea behind prezi.com",
+ "homepage": "https://github.com/bartaz/impress.js",
+ "license" : ["http://bartaz.mit-license.org/", "http://www.gnu.org/licenses/"],
+ "main": [
+ "./js/impress.js",
+ ],
+ "keywords": [
+ "slideshow",
+ "css3"
+ ],
+ "author": {
+ "name": "Bartek Szopka",
+ "web": "http://bartaz.github.com"
+ }
} \ No newline at end of file