# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1324392625 -3600
# Node ID 38c782b84ac26afc8a70f62a183e4240d85c4ba5
# Parent  527724d26036d5d65eac1beb51b60e26e3e89153# Parent  cb22fcb2e2fcf50e91dfaa5cd075e045126497bd
Merge.

diff -r cb22fcb2e2fc -r 38c782b84ac2 mx/.project
--- a/mx/.project	Tue Dec 20 15:48:29 2011 +0100
+++ b/mx/.project	Tue Dec 20 15:50:25 2011 +0100
@@ -3,6 +3,7 @@
 	<name>mx</name>
 	<comment></comment>
 	<projects>
+		<project>mxtool</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff -r cb22fcb2e2fc -r 38c782b84ac2 mx/.pydevproject
--- a/mx/.pydevproject	Tue Dec 20 15:48:29 2011 +0100
+++ b/mx/.pydevproject	Tue Dec 20 15:50:25 2011 +0100
@@ -7,5 +7,8 @@
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/mx</path>
 </pydev_pathproperty>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/mxtool</path>
+</pydev_pathproperty>
 
 </pydev_project>
diff -r cb22fcb2e2fc -r 38c782b84ac2 mx/commands.py
--- a/mx/commands.py	Tue Dec 20 15:48:29 2011 +0100
+++ b/mx/commands.py	Tue Dec 20 15:50:25 2011 +0100
@@ -26,7 +26,7 @@
 #
 # ----------------------------------------------------------------------------------------------------
 
-import os, sys, shutil, tarfile, StringIO
+import os, sys, shutil, StringIO
 from os.path import join, exists, dirname, isfile, isdir, isabs
 import mx
 import sanitycheck
diff -r cb22fcb2e2fc -r 38c782b84ac2 mxtool/.project
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mxtool/.project	Tue Dec 20 15:50:25 2011 +0100
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>mxtool</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff -r cb22fcb2e2fc -r 38c782b84ac2 mxtool/.pydevproject
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mxtool/.pydevproject	Tue Dec 20 15:50:25 2011 +0100
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/mxtool</path>
+</pydev_pathproperty>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+</pydev_project>