From a8149ee80144092c41a3804fe695a30d5f696988 Mon Sep 17 00:00:00 2001 From: Mark Murphy Date: Fri, 17 Jan 2014 08:01:43 -0500 Subject: [PATCH 1/3] fixed typo --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index d96ae46..f6dc569 100755 --- a/README.markdown +++ b/README.markdown @@ -17,7 +17,7 @@ widgets. Installation ------------ This Android library project is -[available as a JAR](https://gihub.com/commonsguy/cwac-merge/releases). +[available as a JAR](https://github.com/commonsguy/cwac-merge/releases). If you wish to use the JAR, you will need to also add the JAR from [the CWAC-Sacklist project](http://github.com/commonsguy/cwac-sacklist) to your project From aa088848bf7ffd11c38d970e493ad6d3c4bb3079 Mon Sep 17 00:00:00 2001 From: Mark Murphy Date: Wed, 14 May 2014 06:33:38 -0400 Subject: [PATCH 2/3] Update README.markdown --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index f6dc569..23076b3 100755 --- a/README.markdown +++ b/README.markdown @@ -186,7 +186,7 @@ file. Questions --------- If you have questions regarding the use of this code, please post a question -on [StackOverflow](http://stackoverflow.com/questions/ask) tagged with `commonsware` and `android`. Be sure to indicate +on [StackOverflow](http://stackoverflow.com/questions/ask) tagged with `commonsware-cwac` and `android`. Be sure to indicate what CWAC module you are having issues with, and be sure to include source code and stack traces if you are encountering crashes. From 5e73008b9d275719455be3c1fbba1775baae94b0 Mon Sep 17 00:00:00 2001 From: Kevin Grant Date: Sat, 14 Jun 2014 19:30:45 -0400 Subject: [PATCH 3/3] Remove backup to prevent manifest merger conflicts --- merge/AndroidManifest.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/merge/AndroidManifest.xml b/merge/AndroidManifest.xml index e50d6a1..e77db8e 100644 --- a/merge/AndroidManifest.xml +++ b/merge/AndroidManifest.xml @@ -3,8 +3,4 @@ package="com.commonsware.cwac.merge" android:versionCode="1" android:versionName="1.0"> - - - - - \ No newline at end of file +