aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉloi Rivard <azmeuk@gmail.com>2013-04-02 14:25:32 +0300
committerÉloi Rivard <azmeuk@gmail.com>2013-04-04 11:17:37 +0200
commite646c6db2b518dd3f734e0fe33fe337334ce94c5 (patch)
treef9a82ef9c6cef907f92ec4cbeec1a746fb03825d
parent9479779ef45b9273ecfb51fe95b99d13b6cfdf76 (diff)
Update AUTHORS
-rw-r--r--AUTHORS2
1 files changed, 0 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 9eda9851..401b408a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -57,5 +57,3 @@ a license to everyone to use it as detailed in LICENSE.)
* Ting-Yuan Huang <thuang@mozilla.com>
* Felix H. Dahlke <fhd@ubercode.de>
* Éloi Rivard <azmeuk@gmail.com>
-
->>>>>>> * OpenGL extensions.