diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:56:21 +0100 |
| commit | 7cb543fb742a837c4931513674febaec5e4c1401 (patch) | |
| tree | ddefe5b9329907818aa6eb3b593f555b29ccb869 /apt-pkg/contrib/configuration.cc | |
| parent | f6cb0880a4b5d31e398cceb2e2577b6b82f4fffb (diff) | |
| parent | 71ecaad29d8066a494f516efc5efd80860653fe2 (diff) | |
merged from lp:~mvo/apt/mvo (that has all the changes from debian-experimental2) and resolved a bunch of conflicts
Diffstat (limited to 'apt-pkg/contrib/configuration.cc')
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 2db191ba2..0949ec223 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -15,16 +15,19 @@ ##################################################################### */ /*}}}*/ // Include files /*{{{*/ +#include <config.h> + #include <apt-pkg/configuration.h> #include <apt-pkg/error.h> #include <apt-pkg/strutl.h> #include <apt-pkg/fileutl.h> -#include <apti18n.h> #include <vector> #include <fstream> #include <iostream> +#include <apti18n.h> + using namespace std; /*}}}*/ |