Merge branch 'release/2.1.0'

picoe · Sep 14, 2015 · 858ecb8 · 858ecb8
2 parents 06cecf6 + 983c413
commit 858ecb8
Show file tree

Hide file tree

Showing 1,189 changed files with 40,994 additions and 22,633 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,9 +8,6 @@ obj/
 /BuildOutput
 *.shfbproj_*
 UpgradeLog*.htm
-Source/packages
 Source/Components
 AppPackages
-Resources/packages
-Samples/packages
-Source/Addins/Eto.Addin.XamarinStudio/packages
+packages/
diff --git a/Help/Help.shfbproj b/Help/Help.shfbproj
diff --git a/Help/Site Map.sitemap b/Help/Site Map.sitemap
diff --git a/Help/Top.html b/Help/Top.html
diff --git a/LICENSE b/LICENSE
@@ -1,5 +1,5 @@
 AUTHORS
-Copyright © 2011-2014 Curtis Wensley. All Rights Reserved.
+Copyright © 2011-2015 Curtis Wensley. All Rights Reserved.
 Copyright © 2012-2013 Vivek Jhaveri. All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 

diff --git a/Libraries/MonoMac64/MonoMac.CFNetwork.dll b/Libraries/MonoMac64/MonoMac.CFNetwork.dll
diff --git a/Libraries/MonoMac64/MonoMac.dll b/Libraries/MonoMac64/MonoMac.dll
diff --git a/README.md b/README.md
@@ -9,6 +9,7 @@ Links
 
 * Join the [forums](http://groups.google.com/group/eto-forms)
 * Chat in [#eto.forms](http://chat.mibbit.com/?server=irc.gimp.org&channel=%23eto.forms) on irc.gimp.org
+* Browse the [wiki](https://github.com/picoe/Eto/wiki) for quick start, tutorials, and API
 * Download binaries using NuGet [![NuGet](http://img.shields.io/nuget/v/Eto.Forms.svg?style=flat)](https://www.nuget.org/packages/Eto.Forms.Sample/) with Visual Studio or Xamarin Studio.
 * For bleeding edge nuget packages, add the MyGet development feed [![MyGet](http://img.shields.io/myget/eto/vpre/Eto.Forms.svg?style=flat)](https://www.myget.org/F/eto/) to your sources list.
 
@@ -25,31 +26,41 @@ There is a Mobile/iOS port in the works, but is considered incomplete.
 
 This framework was built so that using it in .NET is natural. For example, a simple hello-world application might look like:
 
-	using Eto.Forms;
-	using Eto.Drawing;
+```C#
+using Eto.Forms;
+using Eto.Drawing;
+
+public class MyForm : Form
+{
+	public MyForm ()
+	{
+		Title = "My Cross-Platform App";
+		ClientSize = new Size(200, 200);
+		Content = new Label { Text = "Hello World!" };
+	}
 
-	public class MyForm : Form
+	[STAThread]
+	static void Main()
 	{
-		public MyForm ()
-		{
-			Title = "My Cross-Platform App";
-			ClientSize = new Size(200, 200);
-			Content = new Label { Text = "Hello World!" };
-		}
-		
-		[STAThread]
-		static void Main()
-		{
-			new Application().Run(new MyForm());
-		}
+		new Application().Run(new MyForm());
 	}
+}
+```
+
+Getting Started
+---------------
+
+To begin creating apps using Eto.Forms, follow the [Quick Start Guide](https://github.com/picoe/Eto/wiki/Quick-Start).
+
+To compile or contribute to Eto.Forms, read the [Contributing Guide](https://github.com/picoe/Eto/wiki/Contributing).
+
 
 Applications
 ------------
 * [Manager](http://www.manager.io) - Accounting Software
 * [PabloDraw](http://picoe.ca/products/pablodraw/alpha) - Character based drawing application
 * [JabbR.Desktop](https://github.com/JabbR/JabbR.Desktop) - JabbR client
-* [Notedown](https://github.com/modmonkeys/Notedown) - Note taking application
+* [Notedown](https://github.com/cwensley/Notedown) - Note taking application
 * [Eto.Test](https://github.com/picoe/Eto/tree/master/Source/Eto.Test) - Application to test the functionality of each widget
 
 Assemblies