songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
64,401 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

394 Commits

Author SHA1 Message Date
Sébastien Loriot b970fc80ef Merge branch 'old/Surface_reconstruction_points_3-Change_package_name-GF' into Surface_reconstruction_points_3-Change_package_name-GF 2015-09-22 09:54:18 +02:00
Laurent Rineau 1d89949b38 Prepare the comments for the changes of 4.8 2015-09-17 13:40:01 +02:00
Laurent Rineau 205f2adabb CGAL-4.7 will be published in October, not September 2015-09-17 13:03:23 +02:00
Laurent Rineau 2d5dd933e5 Reformat the changes.html/CHANGES 
I have:
  - rewrapped the paragraphs so they can be easily copy-pasted in a
    mail,
  - added <code></code> when needed,
  - and I did also minor fixes.
 2015-09-17 13:03:08 +02:00
Sébastien Loriot 470e96e75c document msvc2015 support 2015-09-11 10:42:57 +02:00
Sébastien Loriot a31129f93d add layout for the 4.8 release including the "Surface Reconstruction" part 2015-09-07 10:19:12 +02:00
Laurent Rineau a3187fd35e Merge pull request #285 from janetournois/CGAL-support_msvc2015-GF 
Initial support for MSVC 2015
 2015-08-27 16:34:29 +02:00
Laurent Rineau 3b5ff3f1ff Update changes.html and CHANGES. 2015-08-27 16:32:20 +02:00
Laurent Rineau 5c2c3ca596 Update changes for 4.6.2 2015-08-20 12:10:48 +02:00
Monique Teillaud 48a728791e Update changes.html 
move misplaced entry for 4.5 (mesh3 -> triangulation3)
 2015-08-17 18:16:10 +02:00
Laurent Rineau ebe89cff22 Update the announcement mail 
- fix a typo: connnected
- re-wrap paragraphs
 2015-08-07 17:10:30 +02:00
Laurent Rineau 8a0a14a051 Merge pull request #198 from aympelle/Fix_3D_PT_in_changes_html-APelle 
Fix changes.html
 2015-07-28 16:35:25 +02:00
Laurent Rineau d7c464ccc1 Fix changes.html 
"<version>" must be quoted.
 2015-07-28 16:27:53 +02:00
Aymeric PELLE 92eb77d3d0 Fix changes.html : 3D periodic triangulations changes were badly located. 2015-07-27 16:58:15 +02:00
Sébastien Loriot 4f593d5d96 add info on how to help cmake find qt5 2015-07-17 17:12:00 +02:00
Sébastien Loriot b43c8f4df6 remove comments 2015-07-17 17:04:32 +02:00
Laurent Rineau af341e4c23 Update requirement for Qt5: Debian-stable has 5.3.2 2015-07-17 16:05:12 +02:00
Laurent Rineau 5de30629bc Polish changes.html 2015-07-17 15:58:33 +02:00
Laurent Rineau 08666dce25 Merge pull request #179 from afabri/CGAL-add_hash-GF 
Add boost::hash and std::hash

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash

Conflicts:
	Installation/changes.html
 2015-07-17 15:39:18 +02:00
Sébastien Loriot 5d2c892dbe Merge pull request #149 'lrineau/Polygon_mesh_processing-GF' 
Add various functions to manipulate polygon meshes
 2015-07-17 14:50:56 +02:00
Sébastien Loriot 2668d83d4e Merge pull request #150 from 'cjamin/Point_set_shape_detection_3-cjamin' 
Add an algorithm to fit geometric primitives on a point set

Conflicts:
	Installation/changes.html
	Polyhedron/demo/Polyhedron/CMakeLists.txt
 2015-07-17 14:32:09 +02:00
Laurent Rineau aa72eaa371 Merge pull request #154 from maxGimeno/CGAL-Qt5_support-GF 
Qt5 support, GSoC 2014

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Qt5_support

In this commit, I have fixed the permissions of the file:
	Periodic_3_triangulation_3/demo/Periodic_3_triangulation_3/data/points

In this commit, I have also modified:
	Installation/changes.html
 2015-07-17 14:13:37 +02:00
Andreas Fabri 5c58b6fe21 fix changes.html 2015-07-16 13:34:40 +02:00
Sébastien Loriot c616df7196 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Installation/changes.html
 2015-07-13 08:16:59 +02:00
Laurent Rineau 0fb169701f Copy changes.html from master, to remove conflicts 2015-07-10 18:11:11 +02:00
Laurent Rineau f40fe0dc2d Merge branch 'gsoc2013-Visibility_doc-hemmer' into CGAL-Qt5_support-GF 2015-07-10 18:07:26 +02:00
Laurent Rineau fa13f4ed0c Merge remote-tracking branch 'philaris/sdglinf-philaris' into CGAL-Qt5_support-GF 2015-07-10 17:28:07 +02:00
Laurent Rineau b043876c68 Merge pull request #147 from philaris/sdglinf-philaris 
L Infinity Segment Delaunay Graphs, new package

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Segment_Delaunay_graph_Linf_2
 2015-07-10 17:26:42 +02:00
Sébastien Loriot d70b65e431 Merge branch 'gsoc2013-Visibility_doc-hemmer' 
PR 145
 2015-07-10 15:25:39 +02:00
Laurent Rineau 9ce70faffb Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/CMakeLists.txt

There was also a "conceptual conflict" in:
	Polyhedron/demo/Polyhedron/Polyhedron_demo_mean_curvature_flow_skeleton_plugin.cpp
-> Adapt the declaration of the plugin to the Qt5 way.
 2015-07-09 18:04:09 +02:00
Sébastien Loriot e7563d3e05 Merge branch 'gsoc13-CurveSkeleton-new_package-xgao' 
Conflicts:
	Installation/changes.html
 2015-07-09 17:30:24 +02:00
Sebastien Loriot 43de56ba21 Merge pull request #167 from afabri/AvoidMergeConflicts 
Add place holders for the packages to be integrated
 2015-07-09 10:33:23 +02:00
Laurent Rineau bbd6951161 Merge branch 'afabri/Advancing_front_surface_reconstruction-afabri' into CGAL-Qt5_support-GF 
Conflicts:
	Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.cpp

There was also two "conceptual conflicts" that git-merge did not see,
in:
        Polyhedron/demo/Polyhedron/CMakeLists.txt
        Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp

Polyhedron/demo/Polyhedron/CMakeLists.txt had to use qt5_wrap_ui instead
of qt4_wrap_ui (that lead to a CMake error), and the declaration of the plugin in
Polyhedron/demo/Polyhedron/Polyhedron_demo_advancing_front_plugin.cpp
was not using the Qt5 way (that lead to a compilation error)
 2015-07-08 17:21:36 +02:00
Andreas Fabri 0401e17fc0 move to place holder 2015-07-07 16:46:32 +02:00
Andreas Fabri b2914e78d7 add empty line 2015-07-07 16:18:16 +02:00
Andreas Fabri 7e041bcc50 move to place holder 2015-07-07 15:58:58 +02:00
Andreas Fabri c09f7e86ef fix end of html comment 2015-07-07 14:59:36 +02:00
Andreas Fabri d26fdb17bf Add place holders for the packages to be integrated 2015-07-07 13:37:47 +02:00
Clement Jamin 3b8c24a4df Added the package 2015-07-07 12:06:46 +02:00
Laurent Rineau 49c2cdc19a Merge branch 'master' into sdglinf-philaris 
Conflicts:
	Installation/changes.html
 2015-07-06 18:33:08 +02:00
Andreas Fabri e6ad9a82b3 Add a wrapper for the changes entry of sdglinf-philaris 2015-07-06 11:01:21 +02:00
Sébastien Loriot 05e0900b3e update changes.html 2015-07-06 10:38:41 +02:00
Marc Glisse 253ec38a0a Announce new functors for alpha-shapes 
As asked in the last comment of https://github.com/CGAL/cgal/pull/84
 2015-07-05 16:07:24 +02:00
Sandeep Kumar Dey 5ac1311b01 updated announcement of new package sdg-linf 2015-07-03 17:32:45 +02:00
Sandeep Kumar Dey 6484a56485 announce the new feature sdg-linf 2015-07-03 17:21:51 +02:00
Sébastien Loriot a9fae2ea9b update changes 2015-07-03 16:28:22 +02:00
Laurent Rineau c21c9dda35 Merge pull request #141 from afabri/Advancing_front_surface_reconstruction-afabri 
Advancing Front Surface Reconstruction, new package

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Advancing_front_surface_reconstruction
 2015-07-03 16:26:28 +02:00
Michael Hemmer bdd46e6978 Merge branch 'gsoc2013-Visibility_doc-hemmer-old' into gsoc2013-Visibility_doc-hemmer 
Conflicts:
	Documentation/biblio/cgal_manual.bib
	Documentation/biblio/geom.bib
	Installation/changes.html
 2015-07-02 17:36:17 +02:00
Andreas Fabri c97f1e6d26 remove 2 empty lines 2015-07-02 12:55:46 +02:00
Andreas Fabri a900133057 move package in changes.html to avoid merge conflict 2015-07-02 12:52:54 +02:00