← Back to branch summary

~dannf/ubuntu/saucy/djvulibre/lp1224195

« back to all changes in this revision

Viewing changes to libdjvu/JB2Image.cpp

  • Committer: Package Import Robot
  • Author(s): Benjamin Drung
  • Date: 2010-08-14 13:28:27 UTC
  • mfrom: (12.2.6 sid)
  • Revision ID: package-import@ubuntu.com-20100814132827-jg8yrnov177dl8ou
Tags: 3.5.22-9ubuntu1
https://launchpad.net/bugs/462193
https://launchpad.net/bugs/513725
https://launchpad.net/bugs/337508
* Merge from Debian unstable (LP: #462193), remaining change:
  + 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)
* Use autotools-dev to update config.* files to unclutter debdiffs.
* Change recommendation from mozilla-firefox to firefox (LP: #337508).

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdjvu/JB2Image.cpp
54
54
//C- +------------------------------------------------------------------
55
55
// 
56
56
// $Id: JB2Image.cpp,v 1.13 2007/03/25 20:48:32 leonb Exp $
57
 
// $Name: release_3_5_22 $
 
57
// $Name: debian_version_3_5_22-9 $
58
58
 
59
59
#ifdef HAVE_CONFIG_H
60
60
# include "config.h"