Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
dellis1972 committed Jun 20, 2012
2 parents 5365508 + 6529eae commit 2394f57
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions MonoGame.Framework/MonoGame.Framework.Linux.csproj
Expand Up @@ -7,6 +7,7 @@
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{35253CE1-C864-4CD3-8249-4D1319748E8F}</ProjectGuid>
<OutputType>Library</OutputType>
<CodePage>65001</CodePage>
<RootNamespace>MonoGame.Framework.Linux</RootNamespace>
<AssemblyName>MonoGame.Framework.Linux</AssemblyName>
</PropertyGroup>
Expand Down
4 changes: 3 additions & 1 deletion README.md
Expand Up @@ -2,7 +2,7 @@
MonoGame is an OpenSource, OpenGL implementation of Microsoft's XNA 4 APIs that allows developers to build games that run on Android, iPhone, iPad, MacOS, Linux and soon PlayStation Suite and Windows Metro, all reusing their existing XNA code that runs on Xbox 360 or Windows Phone 7.

# LATEST NEWS
v2.5 has been released and is now available for public consumption.
v2.5.1 has been released and is now available for public consumption.

[Infinite Flight](http://itunes.apple.com/us/app/infinite-flight/id471341991?ls=1&mt=8), MonoGame's first 3D powered game, has been released.

Expand Down Expand Up @@ -72,6 +72,8 @@ cadahl
CircleOf14
vostok4
viyano
directhex
danzel

[Team Xamarin](http://www.xamarin.com) for their support and continued great work on all things Mono
and everyone else that submitted patches/fixes and enhancements. Without your contributions this release would not have been possible.
Expand Down

0 comments on commit 2394f57

Please sign in to comment.