1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 7641b0c1..9eda9851 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -58,3 +58,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Felix H. Dahlke <fhd@ubercode.de>
 * Éloi Rivard <azmeuk@gmail.com>
 
+>>>>>>> * OpenGL extensions.