diff options
| author | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-15 19:07:31 -0800 |
| commit | cdd36ed6c789886657c967e72ec2dcd49c6c5a76 (patch) | |
| tree | b044208c38770c0c4edce03379071dbf2eb29b83 /js/ninja.reel | |
| parent | c7ef6951baff283266df7567e30c8074dda4ad01 (diff) | |
| parent | d366c0bd1af6471511217ed574083e15059519b5 (diff) | |
| download | ninja-cdd36ed6c789886657c967e72ec2dcd49c6c5a76.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/document/html-document.js
Diffstat (limited to 'js/ninja.reel')
| -rwxr-xr-x | js/ninja.reel/ninja.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html index 9a1a6b97..c9f17e3b 100755 --- a/js/ninja.reel/ninja.html +++ b/js/ninja.reel/ninja.html | |||
| @@ -288,6 +288,7 @@ | |||
| 288 | "stage": {"@": "stage1"}, | 288 | "stage": {"@": "stage1"}, |
| 289 | "settings": {"@": "settings1"}, | 289 | "settings": {"@": "settings1"}, |
| 290 | "elementMediator": {"@": "elementMediator"}, | 290 | "elementMediator": {"@": "elementMediator"}, |
| 291 | "dragDropMediator": {"@": "dragDropMediator"}, | ||
| 291 | "undocontroller": {"@": "undocontroller1"}, | 292 | "undocontroller": {"@": "undocontroller1"}, |
| 292 | "selectionController": {"@": "selectionController1"}, | 293 | "selectionController": {"@": "selectionController1"}, |
| 293 | "documentController": {"@": "documentController1"}, | 294 | "documentController": {"@": "documentController1"}, |