Merge remote-tracking branch 'upstream/master' into 120919_sb_sync_take2

13 years ago · 3d25aca158
parent 7b284bbfe7 ef986333fc
commit 3d25aca158
1 changed files with 2 additions and 2 deletions
--- a/astrid/build.xml
+++ b/astrid/build.xml
@ -254,8 +254,8 @@
                     match="package=&quot;.*&quot;"
    	             replace="package=&quot;com.todoroo.astridlite&quot;" />
      <replaceregexp file="AndroidManifest.xml"
-                     match="authorities=&quot;(.*)&quot;"
-                     replace="authorities=&quot;\1.lite&quot;"
+                     match="authorities=&quot;(.*)astrid(.*)&quot;"
+                     replace="authorities=&quot;\1astridlite\2&quot;"
                     flags="g"/>
 	  <replaceregexp file="AndroidManifest.xml"
 	                 match="action android:name=&quot;com.todoroo.astrid"