~ubuntu-branches/ubuntu/maverick/gnome-chemistry-utils/maverick

« back to all changes in this revision

Viewing changes to programs/spectra/application.cc

  • Committer: Bazaar Package Importer
  • Author(s): Micah Gersten
  • Date: 2010-03-29 10:49:13 UTC
  • mfrom: (1.1.6 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100329104913-o335elk75e3emtf8
Tags: 0.10.12-2ubuntu1
* Merge from debian testing (LP: #550972).  Remaining changes:
  - debian/patches/disable_check_omf.dpatch: Added to disable check-doc-omf
    as it requires Internet access
  - debian/patches/00list: Adjusted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
122
122
        if (!Doc)
123
123
                return;
124
124
        list<string> l;
125
 
        unsigned n = 0;
126
125
        char const *mime;
127
126
        map<string, GdkPixbufFormat*>::iterator i, end = m_SupportedPixbufFormats.end ();
128
127
        for (i = m_SupportedPixbufFormats.begin (); i != end; i++)