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 branch 'master' into greenkeeper-load-grunt-tasks-3.4.0

Browse Source 
Conflicts:
	package.json
This commit is contained in:
jdescottes 2016-01-13 23:00:15 +01:00
commit 31edd71c41
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.js
View File

@ -288,7 +288,7 @@ module.exports = function(grunt) {
}, },
macos : { macos : {
options: { options: {
platforms : ['osx64'], osx64: true,
// had performance issues with 0.11.5 on mac os, need to test new versions/new hardware // had performance issues with 0.11.5 on mac os, need to test new versions/new hardware
version : "0.10.5", version : "0.10.5",
build_dir: './dest/desktop/' build_dir: './dest/desktop/'

6
package.json
View File

@ -3,7 +3,7 @@
"name": "piskel", "name": "piskel",
"main": "./dest/prod/index.html", "main": "./dest/prod/index.html",
"description": "Web based 2d animations editor", "description": "Web based 2d animations editor",
"version": "0.6.0-SNAPSHOT", "version": "0.7.0-SNAPSHOT",
"homepage": "http://github.com/juliandescottes/piskel", "homepage": "http://github.com/juliandescottes/piskel",
"repository": { "repository": {
"type": "git", "type": "git",
@ -33,10 +33,10 @@
"grunt-replace": "0.11.0", "grunt-replace": "0.11.0",
"grunt-spritesmith": "6.1.0", "grunt-spritesmith": "6.1.0",
"jasmine-core": "2.1.0", "jasmine-core": "2.1.0",
"karma": "0.13.15", "karma": "0.13.16",
"karma-chrome-launcher": "0.2.2", "karma-chrome-launcher": "0.2.2",
"karma-jasmine": "0.3.5", "karma-jasmine": "0.3.5",
"karma-phantomjs-launcher": "0.2.1", "karma-phantomjs-launcher": "0.2.2",
"load-grunt-tasks": "3.4.0", "load-grunt-tasks": "3.4.0",
"phantomjs": "1.9.19" "phantomjs": "1.9.19"
}, },