test commiyt
no message
no message
Merge branch 'Running_with_error' of https://github.com/bodhisattwadas/AndroidApplicationCarLypso into Images_completed

Conflicts:
	bin/classes/com/example/carlypso/Camera.class
	src/com/example/carlypso/Camera.java
no message
Individual classes implemented
no message
Merge branch 'Images_completed' into HEAD

Conflicts:
	bin/classes/com/example/carlypso/Camera$DrawOnTop.class
	bin/classes/com/example/carlypso/Camera$PhotoHandler.class
	bin/classes/com/example/carlypso/Camera$Preview.class
	bin/classes/com/example/carlypso/Camera.class
	src/com/example/carlypso/CameraView.java
no message
Duos2 fixed
Activity transition running ok
no message
no message
ftp
FTP directory creating but not uploading
[FIX] Fix overlay scale.
[FIX] Fix ftp upload
[ADD] Add progress bar.
[ADD] Add fullscreen feature to cameraview.
Commit at desktop Before Merge with fix
Merge branch 'Overlay_fix' of https://github.com/bodhisattwadas/AndroidApplicationCarLypso into Code_fixed

Conflicts:
	res/values/strings.xml
	src/com/example/carlypso/CameraView.java
	src/com/example/carlypso/DrawOnTop.java
commit