aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-11-26 12:41:09 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-11-26 12:41:09 +0000
commit4dcc47508ebaa05f0ac3e73a1584cdf7bfdb4559 (patch)
tree4f81d3569172a7954e25591ed1c146e578637fdb
parent8ddf5f934b9768272f2e3c840146b96fbd1e9a2f (diff)
downloadenlightenment-4dcc47508ebaa05f0ac3e73a1584cdf7bfdb4559.tar.gz
enlightenment-4dcc47508ebaa05f0ac3e73a1584cdf7bfdb4559.tar.xz
enlightenment-4dcc47508ebaa05f0ac3e73a1584cdf7bfdb4559.zip
merge authors in from tiling.
SVN revision: 79709
-rw-r--r--AUTHORS2
-rw-r--r--src/modules/tiling/AUTHORS2
2 files changed, 2 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 5a23e0623..619067a49 100644
--- 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
index 1ff354024..000000000
--- 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>