← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/engine/string_coalescer.cpp

  • Committer: Package Import Robot
  • Author(s): Adrien Cunin
  • Date: 2012-12-07 17:17:17 UTC
  • mfrom: (1.1.31)
  • Revision ID: package-import@ubuntu.com-20121207171717-nt6as62u4pa1uv11
Tags: 3.6.0.2-1ubuntu1
* Merge from Debian experimental. Remaining Ubuntu change:
   - Added debian/patches/11_use-decimal-si-by-default.patch in order to
     comply with UnitsPolicy

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/engine/string_coalescer.cpp
71
71
};
72
72
 
73
73
 
74
 
// Can't use wxHashMap as it doesn't like forward declarations. That 
 
74
// Can't use wxHashMap as it doesn't like forward declarations. That
75
75
// contraption is actually implemented as a series of ugly macros and
76
76
// not using beautiful templates.
77
77
 
148
148
        {
149
149
                s.push_back(it->first);
150
150
        }
151
 
        
 
151
 
152
152
        wxDateTime start = wxDateTime::UNow();
153
153
        for (int i = 0; i < 100; ++i)
154
154
        {