summaryrefslogtreecommitdiffstats
path: root/ide
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-02-17 11:40:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-17 11:40:49 -0800
commit87be2fd3fd5e35649c7b4320c438dbff63efd6cd (patch)
tree620170a5e729f10c00a010054652de64dc75c584 /ide
parent1f4c4d0b2e3f7aefe8d42883fb96c1683d330065 (diff)
parente0d1a9bcc3279694c57ad273c94ed4975c317797 (diff)
downloadandroid_development-87be2fd3fd5e35649c7b4320c438dbff63efd6cd.tar.gz
android_development-87be2fd3fd5e35649c7b4320c438dbff63efd6cd.tar.bz2
android_development-87be2fd3fd5e35649c7b4320c438dbff63efd6cd.zip
am e0d1a9bc: Merge "Line Wrapping General settings Set "Never join already wrapped lines" to true."
* commit 'e0d1a9bcc3279694c57ad273c94ed4975c317797': Line Wrapping General settings Set "Never join already wrapped lines" to true.
Diffstat (limited to 'ide')
-rw-r--r--ide/eclipse/android-formatting.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/ide/eclipse/android-formatting.xml b/ide/eclipse/android-formatting.xml
index b8277820e..9b4376700 100644
--- a/ide/eclipse/android-formatting.xml
+++ b/ide/eclipse/android-formatting.xml
@@ -247,5 +247,6 @@
<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
</profile>
</profiles>