diff options
author | Jonathan McCrohan <jmccrohan@gmail.com> | 2011-12-01 23:47:41 +0000 |
---|---|---|
committer | Jonathan McCrohan <jmccrohan@gmail.com> | 2011-12-01 23:47:41 +0000 |
commit | 1eaceca55c7e62892fd28bfbb5fc03240a48cee3 (patch) | |
tree | 7243fcd09c57e06e72b15f0044fd2c77babd7843 /lib/libconfigcpp.cc | |
parent | d4b5ddf4bcacd692011f5a597025c38a1262d6ca (diff) | |
parent | 429e46051dba814e7d6c74368eb1bba550222cbe (diff) | |
download | libconfig-1eaceca55c7e62892fd28bfbb5fc03240a48cee3.tar.gz |
Merge commit 'upstream/1.4.8'
Conflicts:
debian/changelog
debian/control
debian/libconfig++9-dev.install
debian/libconfig8.install
debian/libconfig9-dev.install
debian/rules
Diffstat (limited to '')
-rw-r--r-- | lib/libconfigcpp.cc (renamed from libconfigcpp.cc) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libconfigcpp.cc b/lib/libconfigcpp.cc index 3917ee7..9431146 100644 --- a/libconfigcpp.cc +++ b/lib/libconfigcpp.cc @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- libconfig - A structured configuration file parsing library - Copyright (C) 2005-2008 Mark A Lindner + Copyright (C) 2005-2010 Mark A Lindner This file is part of libconfig. |