merge authors in from tiling.

SVN revision: 79709

diff --git a/AUTHORS b/AUTHORS
index 5a23e06..619067a 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -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>

diff --git a/src/modules/tiling/AUTHORS b/src/modules/tiling/AUTHORS
deleted file mode 100644 (file)
index 1ff3540..0000000
--- a/src/modules/tiling/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Boris Faure <billiob@gmail.com>
-Based on original Tiling module by Michael Stapelberg <michael+e17@stapelberg.de>