aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-28 14:55:08 -0800
committerPushkar Joshi2012-02-28 14:55:08 -0800
commitb43efdcbfa671a46d1edaeb1555f508fe2ad0338 (patch)
treef42b28e90b95dedc6e010b4f3f6b3a538a0971a4
parent16d6a90579cdafede931a9c818689fad2e622d8b (diff)
parentf2ab6999a9fdaa18056fb5a148ef1bcaefb7d854 (diff)
downloadninja-b43efdcbfa671a46d1edaeb1555f508fe2ad0338.tar.gz
Merge branch 'pentool' into brushtool
-rw-r--r--manifest.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json
index 313b8d8f..be054798 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
1{ 1{
2 "name": "Motorola Ninja Unpacked", 2 "name": "Motorola Ninja",
3 "description": "Motorola Ninja HTML5 Authoring Tool - Alpha Release", 3 "description": "Motorola Ninja HTML5 Authoring Tool - Alpha Release",
4 "version": "0.5.0.9", 4 "version": "0.5.0.9",
5 "app": { 5 "app": {