Ricky Barrette 8b67f26ace Merge branch 'feature/multi-pointNav' ...

Conflicts:
	IOIOTruck/src/com/TwentyCodes/android/IOIOTruck/MapFragment.java
	IOIOTruck/src/com/TwentyCodes/android/IOIOTruck/NavigationActivity.java

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

2012-03-11 18:08:31 -04:00

..

assets

Inital Commit of my mulitiple point navigation changes

2012-03-10 10:03:17 -05:00

res

Created a Camera Fragment & Activity to start testing computer vision

2012-01-29 15:09:12 -05:00

src/com/TwentyCodes/android/IOIOTruck

Merge branch 'feature/multi-pointNav'

2012-03-11 18:08:31 -04:00

.classpath

Initial Commit

2012-01-22 13:53:19 -05:00

.gitignore

Updated Poject properties

2012-03-04 23:05:15 -05:00

.project

Initial Commit

2012-01-22 13:53:19 -05:00

AndroidManifest.xml

Updated Exception hander Settings

2012-03-04 23:20:07 -05:00

lint.xml

Initial Commit

2012-01-22 13:53:19 -05:00

proguard.cfg

Initial Commit

2012-01-22 13:53:19 -05:00

project.properties

Updated Poject properties

2012-03-04 23:05:15 -05:00