Ricky Barrette fc8952e5e9 Fixed the onActivityResult bug that was caused by the manifest ...

auto mereger. (I removed the auto merge option from project.properties)

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>

2012-08-06 12:35:20 -04:00

..

.externalToolBuilders

Updated the version auto incrementer

2012-07-21 12:19:58 -04:00

.settings

Fixed some lint errors

2012-06-03 11:36:32 -04:00

assets

Inital Commit of the framented migration

2012-05-10 13:07:38 -04:00

libs

Inital Commit of the framented migration

2012-05-10 13:07:38 -04:00

proguard

inital commit

2011-07-20 15:14:19 +00:00

res

Removed original icon and updated first boot dialog

2012-07-23 00:58:40 -04:00

src/com

Removed original icon and updated first boot dialog

2012-07-23 00:58:40 -04:00

.classpath

Updated build props and git ignore

2012-04-24 21:32:50 -04:00

.gitignore

Updated tracking of files and project props

2012-03-03 11:51:49 -05:00

.project

updated build incrementer to use short hash

2012-06-18 11:34:58 -04:00

AndroidManifest.xml

Fixed the onActivityResult bug that was caused by the manifest

2012-08-06 12:35:20 -04:00

build.xml

Fixed the onActivityResult bug that was caused by the manifest

2012-08-06 12:35:20 -04:00

ic_launcher-web.png

Added new launcher icon

2012-07-22 10:05:20 -04:00

lint.xml

Updated build props and git ignore

2012-04-24 21:32:50 -04:00

local.properties

Fixed the onActivityResult bug that was caused by the manifest

2012-08-06 12:35:20 -04:00

proguard.cfg

Updated the progaurd conf files

2012-06-08 01:21:38 -04:00

project.properties

Fixed the onActivityResult bug that was caused by the manifest

2012-08-06 12:35:20 -04:00