Dylan Wilson 3559fb086f fixed some merge conflicts

2017-03-12 20:58:23 +10:00

..

Content

Tiled Rework (#331)

2017-01-18 20:46:38 +10:00

Properties

moved demos to /source/ and into the one solution

2016-03-09 23:19:14 -08:00

app.config

moved demos to /source/ and into the one solution

2016-03-09 23:19:14 -08:00

app.manifest

upgraded the demos to match the monogame 3.6 desktop GL template

2017-03-05 10:24:44 +10:00

CustomEffect.cs

Tiled Fix (#349)

2017-03-05 09:18:11 +10:00

Demo.TiledMaps.csproj

upgraded the demos to match the monogame 3.6 desktop GL template

2017-03-05 10:24:44 +10:00

Game1.cs

fixed some merge conflicts

2017-03-12 20:58:23 +10:00

Icon.bmp

upgraded the demos to match the monogame 3.6 desktop GL template

2017-03-05 10:24:44 +10:00

Icon.ico

moved demos to /source/ and into the one solution

2016-03-09 23:19:14 -08:00

MonoGame.Framework.dll.config

Tiled Fix (#349)

2017-03-05 09:18:11 +10:00

OpenTK.dll.config

moved demos to /source/ and into the one solution

2016-03-09 23:19:14 -08:00

packages.config

Tiled Fix (#349)

2017-03-05 09:18:11 +10:00

Program.cs

moved demos to /source/ and into the one solution

2016-03-09 23:19:14 -08:00