summaryrefslogtreecommitdiffstats
path: root/macosx/ExpressController.h
diff options
context:
space:
mode:
authorprigaux <[email protected]>2007-03-06 21:15:55 +0000
committerprigaux <[email protected]>2007-03-06 21:15:55 +0000
commitc4a642b4648d486777af91ccc2894355df447089 (patch)
tree4ff9eee3e39a530cb649d9db43456e0ab3d712a3 /macosx/ExpressController.h
parentff5ed5d2a2009504f1da3cf348689a59a82b27f1 (diff)
Merge the 5.1 branch into the trunk.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@422 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'macosx/ExpressController.h')
-rw-r--r--macosx/ExpressController.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/ExpressController.h b/macosx/ExpressController.h
index f1e0d1904..5841f4e1f 100644
--- a/macosx/ExpressController.h
+++ b/macosx/ExpressController.h
@@ -1,7 +1,7 @@
/* ExpressController */
#import <Cocoa/Cocoa.h>
-#import "mediafork.h"
+#import "hb.h"
@class DriveDetector;