Browse Source

Merge remote-tracking branch 'origin/master' into logical-tree

Conflicts:
	Perspex.Controls/DataTemplates.cs
	Perspex.SceneGraph/IVisual.cs
pull/39/head
Steven Kirk 12 years ago
parent
commit
b1fe9c9236
  1. 2
      Perspex.Animation/PropertyTransitions.cs
  2. 4
      Perspex.Base/Perspex.Base.csproj
  3. 2
      Perspex.Controls/ColumnDefinitions.cs
  4. 7
      Perspex.Controls/DataTemplates.cs
  5. 1
      Perspex.SceneGraph/IVisual.cs

2
Perspex.Animation/PropertyTransitions.cs

@ -8,6 +8,8 @@ using Perspex.Collections;
namespace Perspex.Animation
{
using Perspex.Collections;
public class PropertyTransitions : PerspexList<PropertyTransition>
{
}

4
Perspex.Base/Perspex.Base.csproj

@ -36,14 +36,14 @@
<ItemGroup>
<Compile Include="Binding.cs" />
<Compile Include="Collections\IPerspexList.cs" />
<Compile Include="Collections\IReadOnlyPerspexList.cs" />
<Compile Include="Collections\PerspexList.cs" />
<Compile Include="Collections\PerspexListExtensions.cs" />
<Compile Include="Collections\SingleItemPerspexList.cs" />
<Compile Include="Contract.cs" />
<Compile Include="Diagnostics\PerspexPropertyValue.cs" />
<Compile Include="IDescription.cs" />
<Compile Include="Collections\PerspexListExtensions.cs" />
<Compile Include="IObservableDescription.cs" />
<Compile Include="Collections\IReadOnlyPerspexList.cs" />
<Compile Include="PerspexObject.cs" />
<Compile Include="PerspexProperty.cs" />
<Compile Include="PerspexPropertyChangedEventArgs.cs" />

2
Perspex.Controls/ColumnDefinitions.cs

@ -8,6 +8,8 @@ using Perspex.Collections;
namespace Perspex.Controls
{
using Perspex.Collections;
public class ColumnDefinitions : PerspexList<ColumnDefinition>
{
}

7
Perspex.Controls/DataTemplates.cs

@ -6,13 +6,6 @@
namespace Perspex.Controls
{
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Linq;
using System.Reactive;
using System.Reactive.Subjects;
using Perspex.Collections;
public class DataTemplates : PerspexList<DataTemplate>

1
Perspex.SceneGraph/IVisual.cs

@ -6,7 +6,6 @@
namespace Perspex
{
using System.Collections.Generic;
using Perspex.Collections;
using Perspex.Media;

Loading…
Cancel
Save