Revision 1c9bbe2c trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj | ||
---|---|---|
308 | 308 |
<Compile Include="Converters\NullToVisibilityConverter.cs" /> |
309 | 309 |
<Compile Include="Converters\SingleLineConverter.cs" /> |
310 | 310 |
<Compile Include="Diagnostics\log4netForwarder.cs" /> |
311 |
<Compile Include="FileProperties\ConflictResolver.cs" /> |
|
311 | 312 |
<Compile Include="FileProperties\ConflictsView.xaml.cs"> |
312 | 313 |
<DependentUpon>ConflictsView.xaml</DependentUpon> |
313 | 314 |
</Compile> |
Also available in: Unified diff