# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1337938981 -7200
# Node ID 2e307c4f3a047751b9d57c68afc875e9b4599fe4
# Parent  e911c4b41417ce905ee8bfe46d2369bd95076aab
eclipse merge

diff -r e911c4b41417 -r 2e307c4f3a04 .settings/org.eclipse.php.core.prefs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.settings/org.eclipse.php.core.prefs	Fri May 25 11:43:01 2012 +0200
@@ -0,0 +1,3 @@
+#Fri Nov 04 12:21:28 CET 2011
+eclipse.preferences.version=1
+include_path=