Johannes Schickel 7fe3bdebc0 Merge pull request #197 from phoenixtail26/cleanedARCorrection.
This is a manual merge with some conflict fixups.

Conflicts:
	backends/platform/iphone/iphone_video.mm
2012-02-24 22:32:49 +01:00
..
2012-01-01 11:49:41 +01:00