← Back to branch summary

~ubuntu-branches/debian/sid/unixodbc/sid

« back to all changes in this revision

Viewing changes to odbcinstQ/CODBCConfig.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2004-10-15 03:07:52 UTC
  • mfrom: (2.1.1 warty)
  • Revision ID: james.westby@ubuntu.com-20041015030752-dzw4vhxlgycz3woj
Tags: 2.2.4-11
Brown paper bag me: conflicts do not write themselves just because
you add a line to the changelog.

Show diffs side-by-side

added added

removed removed

Lines of Context:
odbcinstQ/CODBCConfig.cpp
11
11
 **************************************************/
12
12
#include "CODBCConfig.h"
13
13
 
14
 
#include "smallLinuxODBC.xpm"
 
14
#include "ODBC.xpm"
15
15
 
16
16
CODBCConfig::CODBCConfig( QWidget* parent, const char* name, WFlags nFlags )
17
17
        : QTabDialog( parent, name, nFlags )
18
18
{
19
 
    setIcon( QPixmap( smallLinuxODBC_xpm ) );
 
19
    setIcon( QPixmap( xpmODBC ) );
20
20
    setCaption( "ODBC Data Source Administrator" );
21
21
    setSizeGripEnabled( true );
22
22