diff options
author | Jose Antonio Marquez | 2012-02-08 14:08:35 -0800 |
---|---|---|
committer | Jose Antonio Marquez | 2012-02-08 14:08:35 -0800 |
commit | 5ee983dbbc0dddf18771da1925ccf634a67c365b (patch) | |
tree | 4b3e49624258e39b400476875c084e4438589110 /scss/imports/themes/default/_fonts.scss | |
parent | 553e06c9e903e845cb9cd73971d59561fca375c7 (diff) | |
parent | ab12be4e9a0d9fee4450795077b0107983b5682e (diff) | |
download | ninja-5ee983dbbc0dddf18771da1925ccf634a67c365b.tar.gz |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
scss/imports/scss/_Stage.scss
Diffstat (limited to 'scss/imports/themes/default/_fonts.scss')
-rwxr-xr-x | scss/imports/themes/default/_fonts.scss | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scss/imports/themes/default/_fonts.scss b/scss/imports/themes/default/_fonts.scss new file mode 100755 index 00000000..9174cff3 --- /dev/null +++ b/scss/imports/themes/default/_fonts.scss | |||
@@ -0,0 +1,7 @@ | |||
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 | |||