diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /node_modules/montage/core/converter/upper-case-converter.js | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'node_modules/montage/core/converter/upper-case-converter.js')
| -rwxr-xr-x | node_modules/montage/core/converter/upper-case-converter.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/core/converter/upper-case-converter.js b/node_modules/montage/core/converter/upper-case-converter.js index 33ec0055..f421fd6d 100755 --- a/node_modules/montage/core/converter/upper-case-converter.js +++ b/node_modules/montage/core/converter/upper-case-converter.js | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
| 5 | </copyright> */ | 5 | </copyright> */ |
| 6 | /** | 6 | /** |
| 7 | @module montage/core/converter/upper-case-converter | 7 | @module montage/core/converter/upper-case-converter |
| 8 | @requires montage/core/core | 8 | @requires montage/core/core |
| 9 | @requires montage/core/converter/converter | 9 | @requires montage/core/converter/converter |
| 10 | */ | 10 | */ |