diff options
author | prigaux <[email protected]> | 2007-03-06 21:15:55 +0000 |
---|---|---|
committer | prigaux <[email protected]> | 2007-03-06 21:15:55 +0000 |
commit | c4a642b4648d486777af91ccc2894355df447089 (patch) | |
tree | 4ff9eee3e39a530cb649d9db43456e0ab3d712a3 /macosx/ScanController.h | |
parent | ff5ed5d2a2009504f1da3cf348689a59a82b27f1 (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/ScanController.h')
-rw-r--r-- | macosx/ScanController.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/ScanController.h b/macosx/ScanController.h index 63c50b65c..e872bd048 100644 --- a/macosx/ScanController.h +++ b/macosx/ScanController.h @@ -6,7 +6,7 @@ #include <Cocoa/Cocoa.h> -#include "mediafork.h" +#include "hb.h" @class DriveDetector; @interface ScanController : NSObject { |