aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-14 11:07:21 -0800
committerValerio Virgillito2012-02-14 11:07:21 -0800
commitf060190a3bffd9a16718f2ce0499699103d46372 (patch)
treea308fe7eacec2156c8212dff0892a3de925d5f9a /js/models
parentf766cc203f30ea43ae8b83cf4b65d45cc4435ee9 (diff)
parent33bc9d62b8e6694500bf14d5b18187bd99a520a3 (diff)
downloadninja-f060190a3bffd9a16718f2ce0499699103d46372.tar.gz
Merge branch 'FileIO' of https://github.com/joseeight/ninja-internal into integration
Diffstat (limited to 'js/models')
-rwxr-xr-x[-rw-r--r--]js/models/app-model.js0
-rwxr-xr-x[-rw-r--r--]js/models/color-model.js0
-rwxr-xr-x[-rw-r--r--]js/models/element-model.js0
-rwxr-xr-x[-rw-r--r--]js/models/properties-3d.js0
-rwxr-xr-x[-rw-r--r--]js/models/shape-model.js0
5 files changed, 0 insertions, 0 deletions
diff --git a/js/models/app-model.js b/js/models/app-model.js
index 57394bb9..57394bb9 100644..100755
--- a/js/models/app-model.js
+++ b/js/models/app-model.js
diff --git a/js/models/color-model.js b/js/models/color-model.js
index 2c86422f..2c86422f 100644..100755
--- a/js/models/color-model.js
+++ b/js/models/color-model.js
diff --git a/js/models/element-model.js b/js/models/element-model.js
index 831e8b1e..831e8b1e 100644..100755
--- a/js/models/element-model.js
+++ b/js/models/element-model.js
diff --git a/js/models/properties-3d.js b/js/models/properties-3d.js
index cf4a045f..cf4a045f 100644..100755
--- a/js/models/properties-3d.js
+++ b/js/models/properties-3d.js
diff --git a/js/models/shape-model.js b/js/models/shape-model.js
index 58a88fd0..58a88fd0 100644..100755
--- a/js/models/shape-model.js
+++ b/js/models/shape-model.js