filux aa5403d8ef Merge remote branch 'upstream/master'. ...

Conflicts:
	mk/linux/.gitignore
	mk/windoze/coverity-scan.bat

2014-01-27 08:23:42 +01:00

..

g3d_viewer

- missed a few other refs to xerces in cmake scripts

2014-01-25 18:27:08 -08:00

glest_game

- ensure we get a newline after doing a version check when streflop disabled

2014-01-26 19:39:50 -08:00

glest_map_editor

- missed some updates

2014-01-24 09:50:17 -08:00

masterserver

Merge branch 'master' of https://github.com/MegaGlest/megaglest-source

2014-01-18 17:16:44 -06:00

shared_lib

Merge remote branch 'upstream/master'. Resolved conflicts in: mk/windoze/coverity-scan.bat

2014-01-26 09:46:53 +01:00

tests

- stubbed out use of xerces as no code was using it any longer. Xerces is no longer a requirement to build, we have been using rapidxml for a long time now. For now the MACRO: WANT_XERCES will build Xerces support into th egame, but it is still not used. We will likely deprecate xerces from megaglest soon.

2014-01-25 17:09:52 -08:00

tools

newest blender exporter from Yggdrasil (thanks!!) . Works with blender 2.69 and later and fixes a serious bug with normals and too many exported vertices.

2014-01-17 23:14:40 +01:00

.gitignore

The documentation's files format will be more friendly for the average Windows OS user.

2014-01-25 20:29:49 +01:00