Benjamin Ward 7250f4f4e5 Merge branch 'master' of https://github.com/craftworkgames/Monogame.Extended into feature-sprites ...

Conflicts:
	Source/MonoGame.Extended/Graphics/SpriteBatchExtensions.cs
	Source/MonoGame.Extended/MonoGame.Extended.csproj
	Source/Sandbox/Content/Content.mgcb
	Source/Sandbox/SandboxGame.cs

2015-08-02 15:16:32 -04:00

..

MonoGame.Extended

Merge branch 'master' of https://github.com/craftworkgames/Monogame.Extended into feature-sprites

2015-08-02 15:16:32 -04:00

MonoGame.Extended.Content.Pipeline

Fixed tools versions to compile on Linux, fixing sln file to use correct folder structure

2015-08-01 09:04:46 -04:00

MonoGame.Extended.Content.Pipeline.Tests

fixed some issues with the broken build

2015-08-02 21:35:27 +10:00

MonoGame.Extended.Tests

Fixed tools versions to compile on Linux, fixing sln file to use correct folder structure

2015-08-01 09:04:46 -04:00

Sandbox

Merge branch 'master' of https://github.com/craftworkgames/Monogame.Extended into feature-sprites

2015-08-02 15:16:32 -04:00

MonoGame.Extended.sln

fixed some issues with the broken build

2015-08-02 21:35:27 +10:00