aboutsummaryrefslogtreecommitdiffstats
path: root/AUTHORS
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2011-12-01 23:47:41 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2011-12-01 23:47:41 +0000
commit1eaceca55c7e62892fd28bfbb5fc03240a48cee3 (patch)
tree7243fcd09c57e06e72b15f0044fd2c77babd7843 /AUTHORS
parentd4b5ddf4bcacd692011f5a597025c38a1262d6ca (diff)
parent429e46051dba814e7d6c74368eb1bba550222cbe (diff)
downloadlibconfig-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--AUTHORS4
1 files changed, 2 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index bd30122..f3f7465 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
Mark Lindner - Lead developer & maintainer.
-Daniel Marjamäki - Enhancements & bugfixes.
-Andrew Tytula - Windows Port.
+Daniel Marjamäki - Enhancements & bugfixes.
+Andrew Tytula - Windows port.
Glenn Herteg - Enhancements, bugfixes, documentation corrections.