← Back to branch summary

~ubuntu-branches/ubuntu/raring/djvulibre/raring

« back to all changes in this revision

Viewing changes to gui/indep/QT/qt_painter.cpp

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2010-11-17 16:03:21 UTC
  • mfrom: (1.1.7) (12.2.9 sid)
  • Revision ID: package-import@ubuntu.com-20101117160321-mp1qlaj5686tqe3g
Tags: 3.5.23-3ubuntu1
https://launchpad.net/bugs/513725
* Merge from Debian unstable.  Remaining changes:
  + Fix thumb2 porting issues; we suspect that the mov found during code
    review is not an active code path; adding compile time error
    #ifdef __thumb__ to ensure that its really not used in Ubuntu;
    Thanks for Dave Martin for this patch (LP: #513725)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gui/indep/QT/qt_painter.cpp
54
54
//C- +------------------------------------------------------------------
55
55
// 
56
56
// $Id: qt_painter.cpp,v 1.9 2007/03/25 20:48:23 leonb Exp $
57
 
// $Name: debian_version_3_5_22-9 $
 
57
// $Name: debian_version_3_5_23-3 $
58
58
 
59
59
#ifdef HAVE_CONFIG_H
60
60
# include "config.h"