diff options
| author | Ananya Sen | 2012-01-31 07:00:49 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-01-31 07:00:49 -0800 |
| commit | 61ff730a1897890f71403cbfac4d15269e2d271f (patch) | |
| tree | 4a2893e935c259ec9fbe9446d64af5172ec6299d /js/io/templates/files | |
| parent | 906776893138257f96a0530674eda456ca3d817b (diff) | |
| parent | 6dc03672707a91085954359d82c14bd876f85b12 (diff) | |
| download | ninja-61ff730a1897890f71403cbfac4d15269e2d271f.tar.gz | |
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts:
_scss/imports/scss/_Stage.scss
js/io/system/coreioapi.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io/templates/files')
| -rwxr-xr-x | js/io/templates/files/_bin/template.css (renamed from js/io/templates/files/template.css) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/_bin/template.html (renamed from js/io/templates/files/template.html) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/_bin/template.js (renamed from js/io/templates/files/template.js) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/_bin/template.json (renamed from js/io/templates/files/template.json) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/_bin/template.php (renamed from js/io/templates/files/template.php) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/_bin/template.pl (renamed from js/io/templates/files/template.pl) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/_bin/template.py (renamed from js/io/templates/files/template.py) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/_bin/template.rb (renamed from js/io/templates/files/template.rb) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/_bin/template.xml (renamed from js/io/templates/files/template.xml) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/_bin/xml.txt (renamed from js/io/templates/files/xml.txt) | 0 | ||||
| -rwxr-xr-x | js/io/templates/files/css.txt | 2 | ||||
| -rwxr-xr-x | js/io/templates/files/html.txt | 19 | ||||
| -rwxr-xr-x | js/io/templates/files/js.txt | 1 | ||||
| -rwxr-xr-x | js/io/templates/files/php.txt | 3 | ||||
| -rwxr-xr-x | js/io/templates/files/pl.txt | 1 | ||||
| -rwxr-xr-x | js/io/templates/files/py.txt | 1 | ||||
| -rwxr-xr-x | js/io/templates/files/rb.txt | 1 |
17 files changed, 28 insertions, 0 deletions
diff --git a/js/io/templates/files/template.css b/js/io/templates/files/_bin/template.css index e69de29b..e69de29b 100755 --- a/js/io/templates/files/template.css +++ b/js/io/templates/files/_bin/template.css | |||
diff --git a/js/io/templates/files/template.html b/js/io/templates/files/_bin/template.html index e69de29b..e69de29b 100755 --- a/js/io/templates/files/template.html +++ b/js/io/templates/files/_bin/template.html | |||
diff --git a/js/io/templates/files/template.js b/js/io/templates/files/_bin/template.js index e69de29b..e69de29b 100755 --- a/js/io/templates/files/template.js +++ b/js/io/templates/files/_bin/template.js | |||
diff --git a/js/io/templates/files/template.json b/js/io/templates/files/_bin/template.json index e69de29b..e69de29b 100755 --- a/js/io/templates/files/template.json +++ b/js/io/templates/files/_bin/template.json | |||
diff --git a/js/io/templates/files/template.php b/js/io/templates/files/_bin/template.php index e69de29b..e69de29b 100755 --- a/js/io/templates/files/template.php +++ b/js/io/templates/files/_bin/template.php | |||
diff --git a/js/io/templates/files/template.pl b/js/io/templates/files/_bin/template.pl index e69de29b..e69de29b 100755 --- a/js/io/templates/files/template.pl +++ b/js/io/templates/files/_bin/template.pl | |||
diff --git a/js/io/templates/files/template.py b/js/io/templates/files/_bin/template.py index e69de29b..e69de29b 100755 --- a/js/io/templates/files/template.py +++ b/js/io/templates/files/_bin/template.py | |||
diff --git a/js/io/templates/files/template.rb b/js/io/templates/files/_bin/template.rb index e69de29b..e69de29b 100755 --- a/js/io/templates/files/template.rb +++ b/js/io/templates/files/_bin/template.rb | |||
diff --git a/js/io/templates/files/template.xml b/js/io/templates/files/_bin/template.xml index e69de29b..e69de29b 100755 --- a/js/io/templates/files/template.xml +++ b/js/io/templates/files/_bin/template.xml | |||
diff --git a/js/io/templates/files/xml.txt b/js/io/templates/files/_bin/xml.txt index e69de29b..e69de29b 100755 --- a/js/io/templates/files/xml.txt +++ b/js/io/templates/files/_bin/xml.txt | |||
diff --git a/js/io/templates/files/css.txt b/js/io/templates/files/css.txt index e69de29b..07da1f8a 100755 --- a/js/io/templates/files/css.txt +++ b/js/io/templates/files/css.txt | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | @charset "UTF-8"; | ||
| 2 | /* Created with Motorola Mobility Ninja */ | ||
diff --git a/js/io/templates/files/html.txt b/js/io/templates/files/html.txt index e69de29b..15641348 100755 --- a/js/io/templates/files/html.txt +++ b/js/io/templates/files/html.txt | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | <html> | ||
| 2 | |||
| 3 | <head> | ||
| 4 | |||
| 5 | <title>Untitled</title> | ||
| 6 | |||
| 7 | <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | ||
| 8 | |||
| 9 | <meta name="generator" content="Motorola Mobility Ninja"> | ||
| 10 | |||
| 11 | <style type="text/css"> | ||
| 12 | </style> | ||
| 13 | |||
| 14 | </head> | ||
| 15 | |||
| 16 | <body> | ||
| 17 | </body> | ||
| 18 | |||
| 19 | </html> \ No newline at end of file | ||
diff --git a/js/io/templates/files/js.txt b/js/io/templates/files/js.txt index e69de29b..0a6e79c2 100755 --- a/js/io/templates/files/js.txt +++ b/js/io/templates/files/js.txt | |||
| @@ -0,0 +1 @@ | |||
| /* Created with Motorola Mobility Ninja */ | |||
diff --git a/js/io/templates/files/php.txt b/js/io/templates/files/php.txt index e69de29b..95e76401 100755 --- a/js/io/templates/files/php.txt +++ b/js/io/templates/files/php.txt | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <?php | ||
| 2 | /* Created with Motorola Mobility Ninja */ | ||
| 3 | ?> \ No newline at end of file | ||
diff --git a/js/io/templates/files/pl.txt b/js/io/templates/files/pl.txt index e69de29b..ee414436 100755 --- a/js/io/templates/files/pl.txt +++ b/js/io/templates/files/pl.txt | |||
| @@ -0,0 +1 @@ | |||
| # Created with Motorola Mobility Ninja | |||
diff --git a/js/io/templates/files/py.txt b/js/io/templates/files/py.txt index e69de29b..abc89039 100755 --- a/js/io/templates/files/py.txt +++ b/js/io/templates/files/py.txt | |||
| @@ -0,0 +1 @@ | |||
| # Created with Motorola Mobility Ninja \ No newline at end of file | |||
diff --git a/js/io/templates/files/rb.txt b/js/io/templates/files/rb.txt index e69de29b..abc89039 100755 --- a/js/io/templates/files/rb.txt +++ b/js/io/templates/files/rb.txt | |||
| @@ -0,0 +1 @@ | |||
| # Created with Motorola Mobility Ninja \ No newline at end of file | |||