Tags: siramix/buzzwords
Tags
Merge branch 'FixVersionForAmazon' into release-lite * FixVersionForAmazon: Updating the version to properly track the Amazon version. Incrementing the version for the release. Polished LogoText to match old logo better. Added hdpi versions of the logo. Reworked text a bit since I didn't have that font. Fixed #108 - Rule text now is more clear about using words and phrases. Conflicts: AndroidManifest.xml
Merge branch 'FixVersionForAmazon' into release-lite * FixVersionForAmazon: Updating the version to properly track the Amazon version. Incrementing the version for the release. Polished LogoText to match old logo better. Added hdpi versions of the logo. Reworked text a bit since I didn't have that font. Fixed #108 - Rule text now is more clear about using words and phrases. Conflicts: AndroidManifest.xml
Merge branch 'amazon-FAOTD' into release-lite * amazon-FAOTD: testing merging Cherry-picking [#38] Apk should be installable on an SD card now. Test on Droid X. Prep for Amazon FAOTD cont... Cherry-picked Facebook ad on title and added some logic/marketing text. Cherry-picking feature#69 Siramix icon on Title replaced with link to Facebook page. Incrementing the version number. Conflicts: AndroidManifest.xml res/values/strings.xml
PreviousNext