From: Bjoern Sikora <bjoern.sikora@intra2net.com>
Date: Mon, 27 Jul 2009 08:40:18 +0000 (+0200)
Subject: Merged Tom's changes into my HEAD
X-Git-Tag: v1.1~275
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=bd5651614685a8d318711205ad4cd9bb993f86b7;p=bpdyndnsd

Merged Tom's changes into my HEAD

Merge commit '4248e8ca2f83e33137e3dce90c939f7b21e355a4'; commit '7ec77cf125ac21e7a6c0ef7aa99ab84c71c680d1'
---

bd5651614685a8d318711205ad4cd9bb993f86b7
diff --cc src/config.h
index d287917,e6cd76f..8fe49bf
--- a/src/config.h
+++ b/src/config.h
@@@ -26,11 -24,10 +26,12 @@@
  #include "ods.h"
  
  namespace po = boost::program_options;
 +namespace fs = boost::filesystem;
 +
  using namespace std;
  
- class Config{
+ class Config
+ {
  private:
      po::options_description *opt_desc_cmd;
      po::options_description *opt_desc_conf_main;