Fixed merge

This commit is contained in:
Christophe Riccio 2010-10-04 10:30:50 +01:00
parent a9c7b3075f
commit 197ba53dda

View File

@ -3,7 +3,7 @@
<glm copyright="Copyright © 2005 - 2010 "> <glm copyright="Copyright © 2005 - 2010 ">
<downloads> <downloads>
<section name="GLM - zip files"> <section name="GLM - zip files">
<download name="GLM 0.9.0.3" date="26/08/2010" size="809 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.3/glm-0.9.0.3.zip/download"/> <download name="GLM 0.9.0.3" date="26/08/2010" size="1.2 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.3/glm-0.9.0.3.zip/download"/>
<download name="GLM 0.9.0.2" date="08/07/2010" size="809 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.2/glm-0.9.0.2.zip/download"/> <download name="GLM 0.9.0.2" date="08/07/2010" size="809 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.2/glm-0.9.0.2.zip/download"/>
<download name="GLM 0.9.0.1" date="21/06/2010" size="727 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.1/glm-0.9.0.1.zip/download"/> <download name="GLM 0.9.0.1" date="21/06/2010" size="727 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.1/glm-0.9.0.1.zip/download"/>
<download name="GLM 0.9.0.0" date="25/05/2010" size="1.0 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.0/glm-0.9.0.0.zip/download"/> <download name="GLM 0.9.0.0" date="25/05/2010" size="1.0 MB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.0/glm-0.9.0.0.zip/download"/>
@ -51,7 +51,7 @@
<download name="GLM 0.1.0.0" date="02/21/2005" size="29.2 KB" link="http://prdownloads.sourceforge.net/glf/glm-0.1-ur.zip?download"/> <download name="GLM 0.1.0.0" date="02/21/2005" size="29.2 KB" link="http://prdownloads.sourceforge.net/glf/glm-0.1-ur.zip?download"/>
</section> </section>
<section name="GLM - 7z files"> <section name="GLM - 7z files">
<download name="GLM 0.9.0.3" date="26/08/2010" size="651 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.3/glm-0.9.0.3.7z/download"/> <download name="GLM 0.9.0.3" date="26/08/2010" size="684 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.3/glm-0.9.0.3.7z/download"/>
<download name="GLM 0.9.0.2" date="08/07/2010" size="651 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.2/glm-0.9.0.2.7z/download"/> <download name="GLM 0.9.0.2" date="08/07/2010" size="651 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.2/glm-0.9.0.2.7z/download"/>
<download name="GLM 0.9.0.1" date="21/06/2010" size="569 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.1/glm-0.9.0.1.7z/download"/> <download name="GLM 0.9.0.1" date="21/06/2010" size="569 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.1/glm-0.9.0.1.7z/download"/>
<download name="GLM 0.9.0.0" date="25/05/2010" size="514 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.0/glm-0.9.0.0.7z/download"/> <download name="GLM 0.9.0.0" date="25/05/2010" size="514 KB" link="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.0/glm-0.9.0.0.7z/download"/>
@ -1529,21 +1529,21 @@
</changelog> </changelog>
<page_news> <page_news>
<news index="0054" date="26/08/2010" title="GLM 0.9.0.3 released" image="goodies/logo.png" image-mini="image/logo-mini.png"> <news index="0054" date="26/08/2010" title="GLM 0.9.0.3 released" image="goodies/logo.png" image-mini="image/logo-mini.png">
<paragraph> <paragraph>
GLM 0.9.0.3 fixes major issues on non-squared matrices. GLM 0.9.0.3 fixes major issues on non-squared matrices.
</paragraph> </paragraph>
<source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.3/glm-0.9.0.3.zip/download">GLM 0.9.0.3 (zip, 809 KB)</source> <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.3/glm-0.9.0.3.zip/download">GLM 0.9.0.3 (zip, 1.2 KB)</source>
<source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.3/glm-0.9.0.3.7z/download">GLM 0.9.0.3 (7z, 651 KB)</source> <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.3/glm-0.9.0.3.7z/download">GLM 0.9.0.3 (7z, 684 KB)</source>
<source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source> <source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source>
</news> </news>
<news index="0053" date="08/07/2010" title="GLM 0.9.0.2 released" image="goodies/logo.png" image-mini="image/logo-mini.png"> <news index="0053" date="08/07/2010" title="GLM 0.9.0.2 released" image="goodies/logo.png" image-mini="image/logo-mini.png">
<paragraph> <paragraph>
Second update of GLM 0.9.0 with more bug fixes. Second update of GLM 0.9.0 with more bug fixes.
It also contains a new extension called GLM_GTX_int_10_10_10_2 to use GLM with OpenGL and It also contains a new extension called GLM_GTX_int_10_10_10_2 to use GLM with OpenGL and
<link href="http://www.opengl.org/registry/specs/ARB/vertex_type_2_10_10_10_rev.txt">GL_ARB_vertex_type_2_10_10_10_rev</link>. <link href="http://www.opengl.org/registry/specs/ARB/vertex_type_2_10_10_10_rev.txt">GL_ARB_vertex_type_2_10_10_10_rev</link>.
</paragraph> </paragraph>
@ -1551,7 +1551,7 @@
<source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.2/glm-0.9.0.2.7z/download">GLM 0.9.0.2 (7z, 651 KB)</source> <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.2/glm-0.9.0.2.7z/download">GLM 0.9.0.2 (7z, 651 KB)</source>
<source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source> <source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source>
</news> </news>
<news index="0052" date="21/06/2010" title="GLM 0.9.0.1 released" image="goodies/logo.png" image-mini="image/logo-mini.png"> <news index="0052" date="21/06/2010" title="GLM 0.9.0.1 released" image="goodies/logo.png" image-mini="image/logo-mini.png">
<paragraph> <paragraph>
This revision only fixes few extensions bugs. This revision only fixes few extensions bugs.
@ -1559,26 +1559,26 @@
<source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.1/glm-0.9.0.1.zip/download">GLM 0.9.0.1 (zip, 714 KB)</source> <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.1/glm-0.9.0.1.zip/download">GLM 0.9.0.1 (zip, 714 KB)</source>
<source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.1/glm-0.9.0.1.7z/download">GLM 0.9.0.1 (7z, 556 KB)</source> <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.1/glm-0.9.0.1.7z/download">GLM 0.9.0.1 (7z, 556 KB)</source>
<source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source> <source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source>
</news> </news>
<news index="0051" date="25/05/2010" title="GLM 0.9.0.0 released" image="goodies/logo.png" image-mini="image/logo-mini.png"> <news index="0051" date="25/05/2010" title="GLM 0.9.0.0 released" image="goodies/logo.png" image-mini="image/logo-mini.png">
<paragraph> <paragraph>
GLM 0.9.0.0 is finally available! It brings various API changes from GLM 0.8.4.X branch which makes it not backward compatible. GLM 0.9.0.0 is finally available! It brings various API changes from GLM 0.8.4.X branch which makes it not backward compatible.
GLM is now compatible with Objective C++ to be used for MacOS X and iPhone projects. GLM is now compatible with Objective C++ to be used for MacOS X and iPhone projects.
</paragraph> </paragraph>
<paragraph> <paragraph>
To continue making GLM a better library, 2 mailing lists have been created for users and developers. To continue making GLM a better library, 2 mailing lists have been created for users and developers.
</paragraph> </paragraph>
<source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.0/glm-0.9.0.0.zip/download">GLM 0.9.0.0 (zip, 1.0 MB)</source> <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.0/glm-0.9.0.0.zip/download">GLM 0.9.0.0 (zip, 1.0 MB)</source>
<source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.0/glm-0.9.0.0.7z/download">GLM 0.9.0.0 (7z, 514 KB)</source> <source type="Download" href="https://sourceforge.net/projects/ogl-math/files/glm-0.9.0.0/glm-0.9.0.0.7z/download">GLM 0.9.0.0 (7z, 514 KB)</source>
<source type="Mailing list" href="https://lists.sourceforge.net/lists/listinfo/ogl-math-users">Register to GLM mailing list for users</source> <source type="Mailing list" href="https://lists.sourceforge.net/lists/listinfo/ogl-math-users">Register to GLM mailing list for users</source>
<source type="Mailing list" href="https://lists.sourceforge.net/lists/listinfo/ogl-math-devel">Register to GLM mailing list for developers</source> <source type="Mailing list" href="https://lists.sourceforge.net/lists/listinfo/ogl-math-devel">Register to GLM mailing list for developers</source>
<source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source> <source type="Link" href="https://sourceforge.net/apps/trac/ogl-math/newticket">Submit a bug report</source>
</news> </news>
<news index="0050" date="30/04/2010" title="GLM 0.9 Beta 2 released" image="goodies/logo.png" image-mini="image/logo-mini.png"> <news index="0050" date="30/04/2010" title="GLM 0.9 Beta 2 released" image="goodies/logo.png" image-mini="image/logo-mini.png">
<paragraph> <paragraph>
GLM 0.9 Beta 2 is available and should be the last development release of GLM 0.9. GLM 0.9 Beta 2 is available and should be the last development release of GLM 0.9.
</paragraph> </paragraph>