summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/App.xaml
diff options
context:
space:
mode:
authorsr55 <[email protected]>2012-03-23 20:00:02 +0000
committersr55 <[email protected]>2012-03-23 20:00:02 +0000
commitf5535905f9ff45c8c25389db9db42049407f8ad8 (patch)
tree76e786c1d6765c210f437f238c5d07ccf7cc2da7 /win/CS/HandBrakeWPF/App.xaml
parent6758f8b30570df5e7d9fcc90e5f75f0aedcc6d5a (diff)
WinGui: (WPF) Wired up the queue window and added missing functionality. Fixed issues on the main windows with regards to GUI widgets not updating during encoding.
WinGui: (WinForms): Added >=30fps options in framerate dropdown git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4526 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/App.xaml')
-rw-r--r--win/CS/HandBrakeWPF/App.xaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/win/CS/HandBrakeWPF/App.xaml b/win/CS/HandBrakeWPF/App.xaml
index f0af595ce..5ac1f993e 100644
--- a/win/CS/HandBrakeWPF/App.xaml
+++ b/win/CS/HandBrakeWPF/App.xaml
@@ -4,6 +4,7 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
+ <ResourceDictionary Source="Views/Styles/Styles.xaml"/>
<ResourceDictionary>
<local:CastleBootstrapper x:Key="bootstrapper" />
</ResourceDictionary>