merge authors in from tiling.

SVN revision: 79709
2012-11-26 12:41:09 +00:00 · 2012-11-26 12:41:09 +00:00 · 4dcc47508e
parent 8ddf5f934b
commit 4dcc47508e
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -44,3 +44,5 @@ Thanatermesis <thanatermesis.ecvs@gmail.com>
 Bruno Dilly <bdilly@profusion.mobi>
 Lucas De Marchi <lucas.demarchi@profusion.mobi>
 Samuel Mendes <heka.lok@gmail.com>
+Boris Faure <billiob@gmail.com>
+Michael Stapelberg <michael+e17@stapelberg.de>
--- a/src/modules/tiling/AUTHORS
+++ b/src/modules/tiling/AUTHORS
@ -1,2 +0,0 @@
-Boris Faure <billiob@gmail.com>
-Based on original Tiling module by Michael Stapelberg <michael+e17@stapelberg.de>