diff options
author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/package.json | |
parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/package.json')
-rwxr-xr-x | node_modules/montage/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/package.json b/node_modules/montage/package.json index 9639d393..23a8ebb5 100755 --- a/node_modules/montage/package.json +++ b/node_modules/montage/package.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "name": "montage", | 2 | "name": "montage", |
3 | "version": "0.10.0", | 3 | "version": "0.11.0", |
4 | "description": "A UI Framework", | 4 | "description": "A UI Framework", |
5 | "main": "montage", | 5 | "main": "montage", |
6 | "overlay": { | 6 | "overlay": { |