Merge branch 'dev'

gamelab · May 28, 2014 · 49d2bc2 · 49d2bc2
2 parents d3efe31 + f444cb1
commit 49d2bc2
Show file tree

Hide file tree

Showing 375 changed files with 96,159 additions and 22,762 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ Thumbs.db
 *.map
 *.orig
 *.js
+.idea*
 /obj/debug/*
 /build/kiwi_src
 !log4javascript.js
@@ -39,8 +40,10 @@ _ReSharper*/
 !/build/*.js
 !/build/src/*
 !/build/src/*/*.js
-!/examples/*/.js
+!/examples/*/*.js
+!/templateGame/*/*.js
 /node_modules
 /GLTests
+/testgl
 tscommand.tmp.txt
 .tscache/build/*
diff --git a/README.md b/README.md
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Kiwi.js",
-  "version": "0.5.3",
+  "version": "1.0.0",
   "homepage": "git://github.com:gamelab/kiwi.js.git",
   "authors": [
     "GameLab"
@@ -14,7 +14,7 @@
     "typescript",
     "javascript"
   ],
-  "license": "GPL",
+  "license": "MIT",
   "ignore": [
     "**/.*",
     "node_modules",