Permalink
Browse files

fix conflict

  • Loading branch information...
2 parents a021851 + d9acb3d commit a520cbead193a31bb473e28babc3b47375b2835b @tomlane tomlane committed Sep 30, 2012
Showing with 14 additions and 0 deletions.
  1. +14 −0 component.json
View
@@ -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"
+ }
}

0 comments on commit a520cbe

Please sign in to comment.