1 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.cpp~ 2009-12-16 13:05:49.000000000 +0200
2 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.cpp 2009-12-16 13:05:51.050534943 +0200
6 #include "ADM_toolkitQt.h"
9 Ui_licenseWindow::Ui_licenseWindow(QWidget *parent) : QDialog(parent)
11 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.cpp~ 2009-12-16 12:45:16.000000000 +0200
12 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.cpp 2009-12-16 13:07:30.231566738 +0200
15 #include "DIA_coreToolkit.h"
16 #include "ADM_toolkitQt.h"
19 static void updateStatus(void);
20 extern bool parseECMAScript(const char *name);
21 --- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h~ 2009-12-16 12:45:15.000000000 +0200
22 +++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h 2009-12-16 13:09:16.437182359 +0200
24 #ifndef ADM_COREUI_TOOLKIT__
25 #define ADM_COREUI_TOOLKIT__
32 --- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h~ 2009-12-16 12:45:16.000000000 +0200
33 +++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h 2009-12-16 13:30:37.550386331 +0200
35 #ifndef ADM_Q_SLIDER_H
36 #define ADM_Q_SLIDER_H
40 class ADM_QSlider : public QSlider