merge heads

2011-12-16 16:12:50 -08:00
commit aa392d61e2
550 changed files with 58000 additions and 0 deletions
@@ -0,0 +1,7 @@
+#Tue Oct 25 14:08:44 PDT 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.apt.aptEnabled=true
+org.eclipse.jdt.apt.genSrcDir=.apt_generated
+org.eclipse.jdt.apt.processorOptions/bin_dir=%PROJECT.DIR%/bin/classes
+org.eclipse.jdt.apt.processorOptions/logfile=%PROJECT.DIR%/AnnotationProcessor.log
+org.eclipse.jdt.apt.reconcileEnabled=false