Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
blinkenlight committed May 13, 2020
2 parents 02a5113 + 524edf9 commit 5b8a374
Show file tree
Hide file tree
Showing 84 changed files with 3,274 additions and 972 deletions.
4 changes: 2 additions & 2 deletions AUTHORS
Expand Up @@ -3,7 +3,7 @@ Source code file for G-Code generation, simulation, and visualization
library.

Copyright (C) 2006 - 2010 by Justin Shumaker
Copyright (C) 2014 by Asztalos Attila Oszkár
Copyright (C) 2014 - 2020 by Asztalos Attila Oszkár

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand All @@ -19,4 +19,4 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

Justin Shumaker (justin at js dot cx)
Asztalos Attila Oszkár (attila dot asztalos at gmail dot com).
Asztalos Attila Oszkár (attila dot asztalos at gmail dot com).
2 changes: 1 addition & 1 deletion ChangeLog
Expand Up @@ -3,7 +3,7 @@ Source code file for G-Code generation, simulation, and visualization
ibrary.

Copyright (C) 2006 - 2010 by Justin Shumaker
Copyright (C) 2014 by Asztalos Attila Oszkár
Copyright (C) 2014 - 2020 by Asztalos Attila Oszkár

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Expand Up @@ -4,7 +4,7 @@
# library.
#
# Copyright (C) 2006 - 2010 by Justin Shumaker
# Copyright (C) 2014 by Asztalos Attila Oszkár
# Copyright (C) 2014 - 2020 by Asztalos Attila Oszkár
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion NEWS
Expand Up @@ -3,7 +3,7 @@ Source code file for G-Code generation, simulation, and visualization
library.

Copyright (C) 2006 - 2010 by Justin Shumaker
Copyright (C) 2014 by Asztalos Attila Oszkár
Copyright (C) 2014 - 2020 by Asztalos Attila Oszkár

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
4 changes: 2 additions & 2 deletions README
Expand Up @@ -3,7 +3,7 @@ Source code file for G-Code generation, simulation, and visualization
library.

Copyright (C) 2006 - 2010 by Justin Shumaker
Copyright (C) 2014 by Asztalos Attila Oszkár
Copyright (C) 2014 - 2020 by Asztalos Attila Oszkár

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -71,4 +71,4 @@ code compared to the legacy version - identical conduct was pursued as far
as possible, but clearly incorrect behavior HAS BEEN occasionally corrected,
so please do consider that your existing projects MAY POTENTIALLY GENERATE
UNEXPECTED RESULTS with the Special Edition. You should ALWAYS verify the
output of GCAM with a G-code simulator to avoid potentially costly mistakes!
output of GCAM with a G-code simulator to avoid potentially costly mistakes!
14 changes: 14 additions & 0 deletions artwork/edit-mirror.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions artwork/view-iso.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5b8a374

Please sign in to comment.