summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorJiří Techet <techet@gmail.com>2010-05-10 23:29:29 +0200
committerJiří Techet <techet@gmail.com>2010-05-10 23:29:29 +0200
commit6ffab22ec0dfbc975b2441f6e5869ebb7a91ea77 (patch)
treec25c0aecdff0d46995cc5baebf61b0f33bd87705 /AUTHORS
parent3494c400dd959ba09e33df2132a83cafa6da0dbb (diff)
parent54f92ec2b8cf24d926830038b2c57cbfb3fc6baa (diff)
downloadlibchamplain-6ffab22ec0dfbc975b2441f6e5869ebb7a91ea77.tar.gz
Merge branch 'LIBCHAMPLAIN_0_4_5'
Conflicts: AUTHORS NEWS configure.ac
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 5a56f4b..afeecce 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -33,3 +33,4 @@ Tollef Fog Heen <tfheen@err.no>
Andreas Henriksson <andreas@fatal.se>
Jiří Techet <techet@gmail.com>
Götz Waschk <waschk@mandriva.org>
+Rob Bradford <rob@linux.intel.com>