diff options
| author | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-08 15:42:40 -0800 |
| commit | 18243deb66ab14a014756bfb0be1a52648c7771a (patch) | |
| tree | c64660f7f69840cac5186fd730221335bd0a67af /_scss/imports/themes/default/_fonts.scss | |
| parent | 802e92eb70b00849dadacf2c6590d27edbe65d99 (diff) | |
| parent | 0537f8f29e7b8dd48fd08f20b1533fbe92a54c4b (diff) | |
| download | ninja-18243deb66ab14a014756bfb0be1a52648c7771a.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/helper-classes/RDGE/GLWorld.js
js/helper-classes/RDGE/MaterialsLibrary.js
Diffstat (limited to '_scss/imports/themes/default/_fonts.scss')
| -rw-r--r-- | _scss/imports/themes/default/_fonts.scss | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/_scss/imports/themes/default/_fonts.scss b/_scss/imports/themes/default/_fonts.scss deleted file mode 100644 index 9174cff3..00000000 --- a/_scss/imports/themes/default/_fonts.scss +++ /dev/null | |||
| @@ -1,7 +0,0 @@ | |||
| 1 | // <copyright> | ||
| 2 | // This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 3 | // No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 4 | // (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 5 | // </copyright> | ||
| 6 | |||
| 7 | |||