Merge ../../../ace

This commit is contained in:
Joe Walker 2011-01-07 12:15:00 +00:00
commit 0bbdc84ef3
3 changed files with 14 additions and 19 deletions

14
.gitignore vendored
View file

@ -1,3 +1,15 @@
# Junk that could exist anywhere:
.DS_Store
*.swp
*.tmp
# Project files that should not be in the repo
.project
.settings/
.settings.xml
.settings.xml.old
.settings.xml.old
# A handy place to put stuff that git should ignore:
/ignore/

View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>editor</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>

@ -1 +1 @@
Subproject commit 1dc34f752c682f4f6c5b3894dc389a5c43b0447e
Subproject commit 308e347893b9ed0645b46aa3f31d1d4fb5205fcc