diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-13 14:51:28 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-01-13 14:51:28 +0100 |
| commit | be4eec613e34a43f34eb9a9b227b69a58fe66ec8 (patch) | |
| tree | ffc2b4d427c95558bbfe8e0202724004751c5ad0 /apt-pkg/contrib/configuration.cc | |
| parent | f45fd56b58a71f2827eb8b4f96333782d84b7b63 (diff) | |
| parent | 72f6c6f8d9b1a92c7795ffcfbdc3b8858eb79a70 (diff) | |
merge with lp:~mvo/apt/debian-sid to get 0.7.25.1 and my changes back
Diffstat (limited to 'apt-pkg/contrib/configuration.cc')
| -rw-r--r-- | apt-pkg/contrib/configuration.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc index 89aa854a3..80b089fac 100644 --- a/apt-pkg/contrib/configuration.cc +++ b/apt-pkg/contrib/configuration.cc @@ -829,8 +829,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool const &AsSectio // ReadConfigDir - Read a directory of config files /*{{{*/ // --------------------------------------------------------------------- /* */ -bool ReadConfigDir(Configuration &Conf,const string &Dir,bool const &AsSectional, - unsigned const &Depth) +bool ReadConfigDir(Configuration &Conf,const string &Dir, + bool const &AsSectional, unsigned const &Depth) { vector<string> const List = GetListOfFilesInDir(Dir, "", true); |