aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorÉloi Rivard <azmeuk@gmail.com>2013-03-15 13:02:33 +0100
committerÉloi Rivard <azmeuk@gmail.com>2013-04-04 11:17:37 +0200
commitc670dde7c62d1e0c2e69ca0720b1b11a3464beba (patch)
tree10ab24555f4a4d2a445ffdb02a9ba522a237fed2 /AUTHORS
parent8d8191488ba8f2d8448f3ae46be51b444f2bf779 (diff)
* OpenGL extensions.
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
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.