Merge branch 'hot-fixes-for-Git'

Conflicts:
	.gitignore

.gitignore

@@ -1424,6 +1424,91 @@ Triangulation_3/test/Triangulation_3/test_triangulation_tds_3
 /build*
 cmake_install.cmake
 cgal_test_with_cmake.log
+*.bak
+*.bk?
+*.old
+.DS_Store
+*.a
+*.o
+*.lib
+*.dll
+*.exe
+*.so
+*.so.*
+debug
+release
+Debug
+Release
+x64
+*.blg
+*.cgallog
+*.aux
+*.maf
+*.hax
+*.hlg
+*.ilg
+*.pdflg
+*.log
+
+*.toc
+*.cgallog.tmp*
+*.inc
+*.dvi
+*.mtc*
+*.idx
+ProgramOutput*
+ErrorOutput*
+CompilerOutput*
+error.txt
+*.ncb
+*.suo
+contents.obv
+.xvpics
+semantic.cache
+doc_ps
+doc_html
+doc_pdf
+*.moc
+.*~
+*~
+.#*
+*.user
+*.aps
+doc_doxygen
+======= end
 CMakeCache.txt
 CMakeFiles
+<<<<<<< variant A
 *.qrc.depends
+>>>>>>> variant B
+cmake_install.cmake
+Doxyfile
+*.dir
+ALL_BUILD.vcproj
+ZERO_CHECK.vcproj
+gmon.*
+.qglviewer.xml
+*.moc_parameters
+*.cpp_parameters
+*_moc.cpp
+ui_*.h
+qrc_*.cxx
+*.sbr
+.dir-locals.el
+*.tmp
+*.ilk
+*.pdb
+*.exe.*
+Makefile
+*.cpp.noheader
+*.h.noheader
+*.h.filename
+*.cpp.filename
+.scm-urls
+*.exp
+*.resource.txt
+*.manifest
+*.manifest.res
+*.vcproj
+*.sln
+*.depends

Testsuite/test/collect_cgal_testresults_from_cmake

@@ -298,6 +298,9 @@ for DIR in $TEST_DIRECTORIES ; do
       echo "  Test files from:" >> "$TEST_REPORT"
       cat .scm-urls >> "$TEST_REPORT"
       echo  >> "$TEST_REPORT"
+    elif [ -f ../../.scm-branch ]; then
+      cat ../../.scm-branch >> "$TEST_REPORT"
+      echo  >> "$TEST_REPORT"
     fi
 
     if [ ! -f ErrorOutput_${CGAL_TEST_PLATFORM} ] ; then