Lex Li 6553f50389 Merge branch 'master' into development_3.0 ...

Conflicts:
	.nuget/DockPanelSuite.nuspec
	DockSample/Customization/DockHelper.cs
	DockSample/Customization/VS2003AutoHideStrip.cs
	DockSample/Customization/VS2003DockPaneCaption.cs
	DockSample/Customization/VS2003DockPaneStrip.cs
	DockSample/DummyDoc.cs
	WinFormsUI.Docking.vs2010.sln
	WinFormsUI/Docking/AutoHideStripBase.cs
	WinFormsUI/Docking/DockAreasEditor.cs
	WinFormsUI/Docking/DockContent.cs
	WinFormsUI/Docking/DockContentEventArgs.cs
	WinFormsUI/Docking/DockContentHandler.cs
	WinFormsUI/Docking/DockPaneCaptionBase.cs
	WinFormsUI/Docking/DockPaneStripBase.cs
	WinFormsUI/Docking/DockPanel.Appearance.cs
	WinFormsUI/Docking/DockPanel.DockDragHandler.cs
	WinFormsUI/Docking/DockPanel.Persistor.cs
	WinFormsUI/Docking/DockPanel.cs
	WinFormsUI/Docking/DockPanelExtender.cs
	WinFormsUI/Docking/DockWindow.cs
	WinFormsUI/Docking/DockWindowCollection.cs
	WinFormsUI/Docking/FloatWindow.cs
	WinFormsUI/Docking/Interfaces.cs
	WinFormsUI/Docking/Measures.cs
	WinFormsUI/Docking/NestedPaneCollection.cs
	WinFormsUI/Docking/SplitterBase.cs
	WinFormsUI/Docking/Strings.Designer.cs
	WinFormsUI/Docking/Strings.resx
	WinFormsUI/Docking/VS2005DockPaneCaption.cs
	WinFormsUI/Docking/VisibleNestedPaneCollection.cs
	WinFormsUI/Docking/Win32/Enums.cs
	WinFormsUI/Properties/AssemblyInfo.cs
	all.bat

2014-12-13 12:28:01 +08:00

..

DockPanelSuite.nuspec

Merge branch 'master' into development_3.0

2014-12-13 12:28:01 +08:00

NuGet.Config

Added NuGet related files.

2012-05-18 21:01:29 +08:00

NuGet.exe

Used latest NuGet files.

2012-09-13 22:34:29 +08:00

NuGet.targets

Used latest NuGet files.

2012-09-13 22:34:29 +08:00