diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /document-templates/projects | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'document-templates/projects')
| -rw-r--r-- | document-templates/projects/montage/index.html | 16 | ||||
| -rw-r--r-- | document-templates/projects/montage/package.json | 8 | ||||
| -rw-r--r-- | document-templates/projects/montage/styles.css | 0 |
3 files changed, 0 insertions, 24 deletions
diff --git a/document-templates/projects/montage/index.html b/document-templates/projects/montage/index.html deleted file mode 100644 index 422a7fb6..00000000 --- a/document-templates/projects/montage/index.html +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <html> | ||
| 3 | |||
| 4 | <head> | ||
| 5 | |||
| 6 | <title>Untitled</title> | ||
| 7 | |||
| 8 | <link rel="stylesheet" type="text/css" href="styles.css" /> | ||
| 9 | |||
| 10 | <script type="text/javascript" data-package="." src="m-js/lib/montage.js"></script> | ||
| 11 | |||
| 12 | </head> | ||
| 13 | |||
| 14 | <body></body> | ||
| 15 | |||
| 16 | </html> \ No newline at end of file | ||
diff --git a/document-templates/projects/montage/package.json b/document-templates/projects/montage/package.json deleted file mode 100644 index 2349ff2f..00000000 --- a/document-templates/projects/montage/package.json +++ /dev/null | |||
| @@ -1,8 +0,0 @@ | |||
| 1 | { | ||
| 2 | "directories": { | ||
| 3 | "lib": "" | ||
| 4 | }, | ||
| 5 | "mappings": { | ||
| 6 | "montage": "m-js/" | ||
| 7 | } | ||
| 8 | } \ No newline at end of file | ||
diff --git a/document-templates/projects/montage/styles.css b/document-templates/projects/montage/styles.css deleted file mode 100644 index e69de29b..00000000 --- a/document-templates/projects/montage/styles.css +++ /dev/null | |||