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 /scss/ninja.scss | |
| 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 'scss/ninja.scss')
| -rwxr-xr-x | scss/ninja.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scss/ninja.scss b/scss/ninja.scss index be323993..b2389e91 100755 --- a/scss/ninja.scss +++ b/scss/ninja.scss | |||
| @@ -29,7 +29,7 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | |||
| 29 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | 29 | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
| 30 | POSSIBILITY OF SUCH DAMAGE. | 30 | POSSIBILITY OF SUCH DAMAGE. |
| 31 | </copyright> */ | 31 | </copyright> */ |
| 32 | 32 | ||
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | // ninja.scss | 35 | // ninja.scss |
| @@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 44 | // Import generic mixins and styles | 44 | // Import generic mixins and styles |
| 45 | @import "imports/scss/mixins"; | 45 | @import "imports/scss/mixins"; |
| 46 | @import "imports/scss/Base"; | 46 | @import "imports/scss/Base"; |
| 47 | 47 | ||
| 48 | // Import everything else | 48 | // Import everything else |
| 49 | @import "imports/scss/MainWindow"; | 49 | @import "imports/scss/MainWindow"; |
| 50 | @import "imports/scss/Stage"; | 50 | @import "imports/scss/Stage"; |