6e731a1656
Merged revisions 53711,53718,53720,53724-53725,53728-53729,53731 via svnmerge from
...
svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r53711 | lrineau | 2010-01-20 21:36:47 +0100 (Wed, 20 Jan 2010) | 2 lines
Fix for Debian: Qt4 QGLViewer library is /usr/lib*/libqglviewer-qt4.so
........
r53718 | lrineau | 2010-01-21 17:57:41 +0100 (Thu, 21 Jan 2010) | 10 lines
Merge from trunk:
| New Revision: 53717
| Author: afabri
| Date: 2010-01-21 17:51:49 +0100 (Thu, 21 Jan 2010)
|
| Log message:
|
| Add operator for MSVC 2005/2008 to avoid a matching ambiguity
........
r53720 | lrineau | 2010-01-21 18:06:33 +0100 (Thu, 21 Jan 2010) | 2 lines
Merge r53719 from trunk (VC workaround)
........
r53724 | lrineau | 2010-01-22 13:34:50 +0100 (Fri, 22 Jan 2010) | 10 lines
Merge from trunk:
| New Revision: 53723
| Author: afabri
| Date: 2010-01-22 13:28:06 +0100 (Fri, 22 Jan 2010)
|
| Log message:
|
| Just FK would be nicer, but VC 2005 messes it up with an FK in a base class when compiling degenerate_test.cpp
|
........
r53725 | lrineau | 2010-01-22 13:44:11 +0100 (Fri, 22 Jan 2010) | 2 lines
Cartesian<float> gives warnings (about truncation from double to float).
........
r53728 | lrineau | 2010-01-22 14:26:40 +0100 (Fri, 22 Jan 2010) | 2 lines
Fix bashism ==
........
r53729 | lrineau | 2010-01-22 15:10:25 +0100 (Fri, 22 Jan 2010) | 3 lines
Re-add g++-3.4 in the list of supported compilers (to be synced with the
testsuite and the CGAL web site).
........
r53731 | lrineau | 2010-01-22 16:09:52 +0100 (Fri, 22 Jan 2010) | 11 lines
Merge fmo trunk:
| ------------------------------------------------------------------------
| r53730 | afabri | 2010-01-22 16:07:59 +0100 (Fri, 22 Jan 2010) | 1 line
| Changed paths:
| M /trunk/Spatial_searching/doc_tex/Spatial_searching/intro.tex
| M /trunk/Spatial_searching/doc_tex/Spatial_searching/main.tex
|
| Moved ccAuthor right after the title
| ------------------------------------------------------------------------
|
........
2010-01-22 15:16:54 +00:00
939aa4304d
Merge from branch 3.4:
...
r47647 | lrineau | 2009-01-05 15:48:29 +0100 (Mon 05 Jan 2009) | 4 lines
Fix buggy behaviour of FindQGLViewer.cmake, which sets QGLVIEWER_LIBRARIES
in the cache, to empty string if QGLViewer is not found. Then, the next
configuration step does not override the variable.
2009-01-05 14:49:32 +00:00
Laurent Rineau
Fernando Cacciola
Laurent Saboret