Changeset 888

Show
Ignore:
Timestamp:
07/11/07 09:45:37 (1 year ago)
Author:
timdewhirst
Message:

jahwidgets
- missed merge cruft

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/jahwidgets/src/qt3/widgets/scribbler.cpp

    r887 r888  
    251251                image = il::convert( image, pf_ ); 
    252252 
    253 <<<<<<< scribbler.cpp 
    254253                pl::wstring format = image->pf( ); 
    255 ======= 
    256                 opl::wstring format = image->pf( ); 
    257 >>>>>>> 1.21 
    258254                int width = image->width( ); 
    259255                int height = image->height( );