mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	Gruntfile.js
This commit is contained in:
Filipe Vieira
2014-05-06 02:53:18 +01:00
parent 7fb5fe93fa c565111947
commit 8a85e953f1
10 changed files with 158 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@@ -1,7 +1,7 @@
{
"author": "Julian Descottes, Vincent Renaudin",
"name": "piskel",
"main": "./desktop/index.html",
"main": "./dest/index.html",
"description": "Web based 2d animations editor",
"version": "0.0.1",
"homepage": "http://github.com/juliandescottes/piskel",
@@ -15,15 +15,19 @@
},
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-clean": "0.5.0",
"grunt-contrib-connect": "0.3.0",
"grunt-contrib-concat": "0.1.2",
"grunt-contrib-copy": "0.5.0",
"grunt-contrib-jshint": "0.5.4",
"grunt-contrib-uglify": "0.2.2",
"grunt-contrib-watch": "0.6.1",
"grunt-express": "1.0",
"grunt-ghost": "1.0.12",
"grunt-open": "0.2.3",
"grunt-leading-indent": "0.1.0",
"grunt-closure-tools": "~0.8.3",
"grunt-node-webkit-builder": "~0.1.21",
"grunt-contrib-copy": "~0.5.0"
"grunt-node-webkit-builder": "~0.1.21"
},
"window": {
"toolbar": false