diff options
| author | Lluis Sanchez Gual <lluis@xamarin.com> | 2014-12-04 12:21:39 +0300 |
|---|---|---|
| committer | Lluis Sanchez Gual <lluis@xamarin.com> | 2014-12-04 12:21:39 +0300 |
| commit | 6b8cf4033ac31ef97ab49b8773f990ee58ee94c3 (patch) | |
| tree | 4d2791a9b865bf244d1bfb193301bfb96880d996 /Xwt.sln | |
| parent | 54d19f53e69a4705a10a7d01e1951e0d5a9236fe (diff) | |
| parent | d98f4219120a1d7754abe9fdb23e06e71a5ce045 (diff) | |
Merge remote-tracking branch 'origin/master' into xammac-unified
Conflicts:
Xwt.Mac/Xwt.Mac.csproj
Xwt.Mac/Xwt.Mac/ToggleButtonBackend.cs
Xwt.sln
Xwt/Xwt.Drawing/Image.cs
Diffstat (limited to 'Xwt.sln')
| -rw-r--r-- | Xwt.sln | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -290,7 +290,6 @@ Global {22524E1F-A94D-4204-AD90-A5FFE73970EC} = {83D74DDF-581E-4E2A-AE02-F4047A5B96C7}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = Testing\MacTestRunner.csproj
Policies = $0
$0.DotNetNamingPolicy = $1
$1.DirectoryNamespaceAssociation = None
|