You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

LukePulverenti 6d5d291762 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser ... Conflicts: MediaBrowser.Common.Implementations/BaseApplicationHost.cs MediaBrowser.ServerApplication/ApplicationHost.cs		12 years ago
..
Controls	…
Implementations	…
Logging	…
Properties	…
Resources/Images	…
App.config	…
App.xaml	…
App.xaml.cs	…
ApplicationHost.cs	Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser	12 years ago
LibraryExplorer.xaml	…
LibraryExplorer.xaml.cs	…
MainWindow.xaml	…
MainWindow.xaml.cs	…
MediaBrowser.ServerApplication.csproj	…
MediaBrowser.ServerApplication_TemporaryKey.pfx	…
app.manifest	…
packages.config	…