From a7ab6cd1f7002f71b482b7061518fb4e26501ec8 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Fri, 7 Jan 2011 12:07:57 +0000
Subject: [PATCH 1/2] project files, back from the dead?

---
 .gitignore | 14 +++++++++++++-
 .project   | 17 -----------------
 2 files changed, 13 insertions(+), 18 deletions(-)
 delete mode 100644 .project

diff --git a/.gitignore b/.gitignore
index 354d9ca3..dcdafe7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
\ No newline at end of file
+.settings.xml.old
+
+# A handy place to put stuff that git should ignore:
+/ignore/
+
diff --git a/.project b/.project
deleted file mode 100644
index dbb46bdc..00000000
--- a/.project
+++ /dev/null
@@ -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>

From 60ddae77a8c4ece200fa37654c51bd2e393218bc Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Fri, 7 Jan 2011 12:12:23 +0000
Subject: [PATCH 2/2] catchup with cockpit

---
 support/cockpit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/support/cockpit b/support/cockpit
index 8d2ddb33..308e3478 160000
--- a/support/cockpit
+++ b/support/cockpit
@@ -1 +1 @@
-Subproject commit 8d2ddb339e40cacc4ea15492bb50323bcc30fb28
+Subproject commit 308e347893b9ed0645b46aa3f31d1d4fb5205fcc