mirror of
https://github.com/piskelapp/piskel.git
synced 2023-08-10 21:12:52 +03:00
Merge branch 'master' into greenkeeper-load-grunt-tasks-3.4.0
Conflicts: package.json
This commit is contained in:
commit
31edd71c41
@ -288,7 +288,7 @@ module.exports = function(grunt) {
|
||||
},
|
||||
macos : {
|
||||
options: {
|
||||
platforms : ['osx64'],
|
||||
osx64: true,
|
||||
// had performance issues with 0.11.5 on mac os, need to test new versions/new hardware
|
||||
version : "0.10.5",
|
||||
build_dir: './dest/desktop/'
|
||||
|
@ -3,7 +3,7 @@
|
||||
"name": "piskel",
|
||||
"main": "./dest/prod/index.html",
|
||||
"description": "Web based 2d animations editor",
|
||||
"version": "0.6.0-SNAPSHOT",
|
||||
"version": "0.7.0-SNAPSHOT",
|
||||
"homepage": "http://github.com/juliandescottes/piskel",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
@ -33,10 +33,10 @@
|
||||
"grunt-replace": "0.11.0",
|
||||
"grunt-spritesmith": "6.1.0",
|
||||
"jasmine-core": "2.1.0",
|
||||
"karma": "0.13.15",
|
||||
"karma": "0.13.16",
|
||||
"karma-chrome-launcher": "0.2.2",
|
||||
"karma-jasmine": "0.3.5",
|
||||
"karma-phantomjs-launcher": "0.2.1",
|
||||
"karma-phantomjs-launcher": "0.2.2",
|
||||
"load-grunt-tasks": "3.4.0",
|
||||
"phantomjs": "1.9.19"
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user