From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 11 Dec 2009 01:53:27 +0000 (-0800)
Subject: resolved conflicts for merge of ce307f88 to eclair-mr2
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/1eb15b505ba1d7ea5a18363c4b7b137f2e9f6d01

resolved conflicts for merge of ce307f88 to eclair-mr2
---

1eb15b505ba1d7ea5a18363c4b7b137f2e9f6d01
diff --cc Main.cpp
index bd03b74,0b51ad8..efbb2f7
--- a/Main.cpp
+++ b/Main.cpp
@@@ -116,9 -116,8 +116,9 @@@ void usage(void
          "   -J  specify where to output R.java resource constant definitions\n"
          "   -M  specify full path to AndroidManifest.xml to include in zip\n"
          "   -P  specify where to output public resource definitions\n"
-         "   -S  directory in which to find resources.  Multiple directories will be scanned"
-         "       and the first match found (left to right) will take precedence."
+         "   -S  directory in which to find resources.  Multiple directories will be scanned\n"
+         "       and the first match found (left to right) will take precedence.\n"
 +        "   -8  Encode string resources in UTF-8.\n"
          "   -0  specifies an additional extension for which such files will not\n"
          "       be stored compressed in the .apk.  An empty string means to not\n"
          "       compress any files at all.\n"