Merged credit entries.

This commit is contained in:
Camilla Berglund 2012-03-26 16:55:31 +02:00
parent 8e4e70d7a4
commit a8bcae8efa

View File

@ -858,9 +858,6 @@ their skills. Special thanks go out to:</p>
<li>Stefan Gustavson, for quick and thorough testing of GLFW on many and <li>Stefan Gustavson, for quick and thorough testing of GLFW on many and
varied operating systems and hardware configurations</li> varied operating systems and hardware configurations</li>
<li>Hans 'Hanmac' Mackowiak, for the initial implementation of cursor enter
and leave callbacks on X11</li>
<li>Sylvain Hellegouarch, for support, bug reports and testing</li> <li>Sylvain Hellegouarch, for support, bug reports and testing</li>
<li>Alex Holkner, for writing the code from which the Compiz/Intel fix was <li>Alex Holkner, for writing the code from which the Compiz/Intel fix was
@ -883,7 +880,8 @@ their skills. Special thanks go out to:</p>
<li>Tristam MacDonald, for his bug reports and feedback on the Cocoa port</li> <li>Tristam MacDonald, for his bug reports and feedback on the Cocoa port</li>
<li>Hans 'Hanmac' Mackowiak, for adding UTF-8 window title support on X11 and <li>Hans 'Hanmac' Mackowiak, for the initial implementation of cursor
enter/leave callbacks on X11, adding UTF-8 window title support on X11 and
a fix for the Xkb support</li> a fix for the Xkb support</li>
<li>David Medlock, for doing the initial Lua port</li> <li>David Medlock, for doing the initial Lua port</li>