mharj/nifskope — pull request #1 by amorilia (2012-09-06 12:57:55+00:00)
Title: Request for hard reset of master and feature branch rebase.

Hi mharj,

This is a pull request, but I'm really requesting that you reset your master branch to mine. For an explanation, see:

http://niftools.sourceforge.net/forum/viewtopic.php?p=24907#p24907

Once you've rebased the master, you can rebase also your feature branches:

git rebase --onto master NifSkope-1.1.0 feature/collada_export

Make sure you also run:

git submodule update --recursive

so you have the latest xml sync and the correct qhull. That should solve all your compile problems.