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 /js/io/system/config.xml | |
| 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 'js/io/system/config.xml')
| -rw-r--r-- | js/io/system/config.xml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/js/io/system/config.xml b/js/io/system/config.xml deleted file mode 100644 index 4660d647..00000000 --- a/js/io/system/config.xml +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | <!-- COPY TO 'MainApp/cloud' and set your own URLs --> | ||
| 3 | <services> | ||
| 4 | <file><![CDATA[http://file.services.ninja.motorola.com/]]></file> | ||
| 5 | <directory><![CDATA[http://directory.services.ninja.motorola.com/]]></directory> | ||
| 6 | </services> | ||