summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2009-10-02 12:03:20 +0200
committerJohannes Schindelin <johannes.schindelin@gmx.de>2009-10-02 12:03:20 +0200
commit65b68e668284eb4aa18614db21cd8d393e37d0c0 (patch)
tree729777f82ace9019e269311f54c0a31ecdfd95fe
parent0c061f2a2757384fb4f43c2462f649a1ba5a6c9e (diff)
parent3704595b93373ab9ee29d57a8b5f8ba2b8c2e03e (diff)
downloadlibtdevnc-65b68e668284eb4aa18614db21cd8d393e37d0c0.tar.gz
libtdevnc-65b68e668284eb4aa18614db21cd8d393e37d0c0.zip
Merge remote branch 'sf/master'
-rw-r--r--AUTHORS2
1 files changed, 1 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index f067a52..d53a76c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -31,7 +31,7 @@ Mark McLoughlin, Paul Fox, Juan Jose Costello, Andre Leiadella,
Alberto Lusiani, Malvina Mazin, Dave Stuart, Rohit Kumar, Donald Dugger,
Steven Carr, Uwe Völker, Charles Coffing, Guillaume Rousse,
Alessandro Praduroux, Brad Hards, Timo Ketola, Christian Ehrlicher,
-Noriaki Yamazaki, Ben Klopfenstein, and Vic Lee.
+Noriaki Yamazaki, Ben Klopfenstein, Vic Lee, and Christian Beier.
Probably I forgot quite a few people sending a patch here and there, which
really made a difference. Without those, some obscure bugs still would