diff options
| author | John Mayhew | 2012-02-10 16:04:19 -0800 |
|---|---|---|
| committer | John Mayhew | 2012-02-10 16:04:19 -0800 |
| commit | 730c1e191e36b8ab8dba576c481a6585e0dfa69e (patch) | |
| tree | c86445ff8d1981e97096ec5e9f6cc5301dc9ea40 | |
| parent | cde1dd9a9156b9682fdf85ce2cd4acdd94124c37 (diff) | |
| parent | 48977780443d97b9e97b047066639c9056788041 (diff) | |
| download | ninja-730c1e191e36b8ab8dba576c481a6585e0dfa69e.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/ninja.reel/ninja.html
134 files changed, 11494 insertions, 2840 deletions
diff --git a/js/panels/Timeline/TimelineController.js b/assets/shaders/Basic.frag.glsl index 6602994d..a2c21afa 100644 --- a/js/panels/Timeline/TimelineController.js +++ b/assets/shaders/Basic.frag.glsl | |||
| @@ -4,10 +4,14 @@ No rights, expressed or implied, whatsoever to thi |