[Aqsis-builds] [buildserver] aqsis-devel: build 132: error

[<bu...@aq...>]

=====================================================================
:: aqsis-devel ::
=====================================================================
Build 132 has completed with status 'error'.

You can view the full build result at:

http://build.aqsis.org/browse/projects/aqsis-devel/builds/132/

Build reason: trigger 'scm trigger'.

Build stages:
  * windows :: bui...@wi...vc :: error
  * linux :: build_linux@master :: success
  * macosx :: build_macosx@osx-x86.gcc :: success

New changes in this build:
  * c0d779cc42af92dc28141f19f71b328e546c2178 by Chris Foster:
    Reinstate doxygen documentation generation
    This was lost during the build system refactor; now
    reinstated with minor
    simplifications to the generation of the Doxyfile.  The
    abil...

Error messages:
  * Error executing recipe build_windows
  - stage windows :: bui...@wi...vc
    * Error executing command 'bootstrap'
  - stage windows :: bui...@wi...vc :: bootstrap
    * Error checking out from SCM: Git command: 'git.exe pull' exited
      with non-zero exit code: 1 (From
      git://aqsis.git.sourceforge.net/gitroot/aqsis
         3acef70..c0d779c  master     -> origin/master
      error: Entry 'CMakeLists.txt' not uptodate. Cannot merge.)