diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /node_modules/montage/ui/composer/swipe-composer.js | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'node_modules/montage/ui/composer/swipe-composer.js')
| -rw-r--r-- | node_modules/montage/ui/composer/swipe-composer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage/ui/composer/swipe-composer.js b/node_modules/montage/ui/composer/swipe-composer.js index ff187e75..0d1b4a69 100644 --- a/node_modules/montage/ui/composer/swipe-composer.js +++ b/node_modules/montage/ui/composer/swipe-composer.js | |||
| @@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | |||
| 28 | POSSIBILITY OF SUCH DAMAGE. | 28 | POSSIBILITY OF SUCH DAMAGE. |
| 29 | </copyright> */ | 29 | </copyright> */ |
| 30 | /** | 30 | /** |
| 31 | @module montage/ui/composer/swipe-composer | 31 | @module montage/ui/composer/swipe-composer |
| 32 | @requires montage | 32 | @requires montage |
| 33 | @requires montage/ui/composer/composer | 33 | @requires montage/ui/composer/composer |
| 34 | */ | 34 | */ |