Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	.gitignore
	js/ninja.reel/ninja.js

1 files changed, 4 insertions, 4 deletions

diff --git a/node_modules/montage/ui/popup/alert.reel/alert.css b/node_modules/montage/ui/popup/alert.reel/alert.css
index 6dee8b6a..70df5033 100755
--- a/node_modules/montage/ui/popup/alert.reel/alert.css
+++ b/node_modules/montage/ui/popup/alert.reel/alert.css
@@ -3,21 +3,21 @@
  No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
  (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
  </copyright> */
- 
+
 .montage-alert-dialog {
     min-width: 300px;
-} 
+}
 .montage-alert-dialog .montage-alert-content {
     font-size: 1.3em;
     padding: 15px;
-    
+
 }
 .montage-alert-dialog .montage-alert-actions {
     float: right;
 }
 
 /*
- 
+
 .montage-alert-dialog {
     font-family: "AG Buch BQ Regular", "AG Buch BQ", Helvetica, Arial, sans-serif;
     background-color: #333;