Merge branch 'release/2.1'

wp-premium · Apr 23, 2014 · 1feb791 · 1feb791
2 parents bee6e7c + 7d76b75
commit 1feb791
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.core.runtime.prefs b/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 include_path=0;/gravityformssurvey
 phpVersion=php5.3
+useShortTags=false
 use_asp_tags_as_php=false
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		line.separator=\n