cd
dfv
cv vcd
Merge branch 'master' of github.com:katyy/Schema

Conflicts:
	Aga.Controls/Tree/TreeListItem.cs
	Aga.Controls/bin/Debug/Aga.Controls.dll
	Aga.Controls/bin/Debug/Aga.Controls.pdb
	Aga.Controls/obj/Debug/Aga.Controls.dll
	Aga.Controls/obj/Debug/Aga.Controls.pdb
	Schema.UI/bin/Debug/Aga.Controls.dll
	Schema.UI/bin/Debug/Aga.Controls.pdb
	Schema.UI/bin/Debug/Schema.UI.exe
	Schema.UI/bin/Debug/Schema.UI.pdb
	Schema.UI/bin/Debug/Shema.Server.dll
	Schema.UI/bin/Debug/Shema.Server.pdb
	Schema.UI/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	Schema.UI/obj/x86/Debug/MainWindow.baml
	Schema.UI/obj/x86/Debug/MainWindow.g.cs
	Schema.UI/obj/x86/Debug/MainWindow.g.i.cs
	Schema.UI/obj/x86/Debug/ResolveAssemblyReference.cache
	Schema.UI/obj/x86/Debug/Schema.UI.exe
	Schema.UI/obj/x86/Debug/Schema.UI.g.resources
	Schema.UI/obj/x86/Debug/Schema.UI.pdb
	Schema.suo
	Shema.Server/bin/Debug/Aga.Controls.dll
	Shema.Server/bin/Debug/Aga.Controls.pdb
	Shema.Server/bin/Debug/Schema.UI.exe
	Shema.Server/bin/Debug/Schema.UI.pdb
	Shema.Server/bin/Debug/Shema.Server.dll
	Shema.Server/bin/Debug/Shema.Server.pdb
	Shema.Server/obj/Debug/ResolveAssemblyReference.cache
	Shema.Server/obj/Debug/Shema.Server.dll
	Shema.Server/obj/Debug/Shema.Server.pdb
dll
add move resize object
add files
Merge branch 'master' of github.com:katyy/Schema

Conflicts:
	.gitignore
	Aga.Controls/bin/Debug/Aga.Controls.dll
	Aga.Controls/bin/Debug/Aga.Controls.pdb
	Aga.Controls/obj/Debug/Aga.Controls.csproj.FileListAbsolute.txt
	Aga.Controls/obj/Debug/Aga.Controls.dll
	Aga.Controls/obj/Debug/Aga.Controls.pdb
	Aga.Controls/obj/Debug/Aga.Controls_MarkupCompile.cache
	Aga.Controls/obj/Debug/Aga.Controls_MarkupCompile.lref
	Aga.Controls/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Aga.Controls/obj/Debug/GeneratedInternalTypeHelper.g.cs
	Aga.Controls/obj/Debug/ResGen.read.1.tlog
	Aga.Controls/obj/Debug/ResGen.write.1.tlog
	Schema.UI/bin/Debug/Aga.Controls.dll
	Schema.UI/bin/Debug/Aga.Controls.pdb
	Schema.UI/bin/Debug/Schema.UI.exe
	Schema.UI/bin/Debug/Schema.UI.pdb
	Schema.UI/bin/Debug/Shema.Server.dll
	Schema.UI/bin/Debug/Shema.Server.pdb
	Schema.UI/obj/x86/Debug/App.g.cs
	Schema.UI/obj/x86/Debug/App.g.i.cs
	Schema.UI/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	Schema.UI/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Schema.UI/obj/x86/Debug/GenerateResource.read.1.tlog
	Schema.UI/obj/x86/Debug/GenerateResource.write.1.tlog
	Schema.UI/obj/x86/Debug/GeneratedInternalTypeHelper.g.i.cs
	Schema.UI/obj/x86/Debug/MainWindow.baml
	Schema.UI/obj/x86/Debug/MainWindow.g.cs
	Schema.UI/obj/x86/Debug/MainWindow.g.i.cs
	Schema.UI/obj/x86/Debug/ResolveAssemblyReference.cache
	Schema.UI/obj/x86/Debug/Schema.UI.csproj.FileListAbsolute.txt
	Schema.UI/obj/x86/Debug/Schema.UI.exe
	Schema.UI/obj/x86/Debug/Schema.UI.g.resources
	Schema.UI/obj/x86/Debug/Schema.UI.pdb
	Schema.UI/obj/x86/Debug/Schema.UI_MarkupCompile.cache
	Schema.UI/obj/x86/Debug/Schema.UI_MarkupCompile.i.cache
	Schema.UI/obj/x86/Debug/Schema.UI_MarkupCompile.i.lref
	Schema.UI/obj/x86/Debug/Schema.UI_MarkupCompile.lref
	Schema.UI/obj/x86/Debug/TreeViewList/ServersTreeView.baml
	Schema.UI/obj/x86/Debug/TreeViewList/ServersTreeView.g.cs
	Schema.UI/obj/x86/Debug/TreeViewList/ServersTreeView.g.i.cs