diff options
author | Marius Kintel <marius@kintel.net> | 2011-04-12 15:51:45 (GMT) |
---|---|---|
committer | Marius Kintel <marius@kintel.net> | 2011-04-12 15:51:45 (GMT) |
commit | 1754a970a76c071fff91cc7c716aa0b78b4ac6be (patch) | |
tree | 5faa0fad3b5324423cd44413d5fdd16c586c1e29 /src/csgops.cc | |
parent | 592ca6abadcb6443629be4407b973279a891278c (diff) | |
parent | a3cfe9e6d76f41cbd13711d1bc3843afe3d14f2d (diff) |
Merge branch 'master' of github.com:openscad/openscad
Diffstat (limited to 'src/csgops.cc')
-rw-r--r-- | src/csgops.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/csgops.cc b/src/csgops.cc index ae97085..55d91d2 100644 --- a/src/csgops.cc +++ b/src/csgops.cc @@ -1,6 +1,7 @@ /* - * OpenSCAD (www.openscad.at) - * Copyright (C) 2009 Clifford Wolf <clifford@clifford.at> + * OpenSCAD (www.openscad.org) + * Copyright (C) 2009-2011 Clifford Wolf <clifford@clifford.at> and + * Marius Kintel <marius@kintel.net> * * 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 |