commit 930fc21489a48165b506864ae82c153e0b91e3f2
author vinayakb <vinayakb@123451ca-8445-de46-9d55-352943316053> Fri Aug 05 06:16:37 2011 +0000
committer vinayakb <vinayakb@123451ca-8445-de46-9d55-352943316053> Fri Aug 05 06:16:37 2011 +0000
tree 26e7559d8bfe6ec3278b3a5fdf07da7fd49f7418
parent d7613895f089a91a1e384cf9ae606fadacb78c33

Merged hyracks_dev_next into trunk

git-svn-id: https://hyracks.googlecode.com/svn/trunk@531 123451ca-8445-de46-9d55-352943316053

hyracks/hyracks-control-nc/.settings/org.eclipse.jdt.core.prefs

diff --git a/hyracks/hyracks-control-nc/.settings/org.eclipse.jdt.core.prefs b/hyracks/hyracks-control-nc/.settings/org.eclipse.jdt.core.prefs
index 05fa00c..dfac000 100644
--- a/hyracks/hyracks-control-nc/.settings/org.eclipse.jdt.core.prefs
+++ b/hyracks/hyracks-control-nc/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Tue Sep 28 12:04:33 PDT 2010
+#Fri May 20 19:34:05 PDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6