espes/MonoGame — pull request #1 by Aranda (2012-08-21 16:09:23+00:00)
Title: Merged in latest develop3d, fix minor conflict and fix Android build

Hi Espes,

Feel free to cancel this pull if you'd prefer to do the merge yourself (it was just one minor conflict in GraphicsDeviceManager.cs). I'm not sure if you're able to test Android, so I've fixed the build for you (just had to add new files to Android csproj). My Android testing shows that nothing obvious has broken, ie Effects and texture reloading still works.

Aranda.