diff options
| author | meta <s@w23.at> | 2011-01-21 21:09:18 (GMT) |
|---|---|---|
| committer | meta <s@w23.at> | 2011-01-21 21:09:18 (GMT) |
| commit | 52a474eb5213cfdda7b4825d51861de27b48954f (patch) | |
| tree | 68844b571bc1a497119de8553c7c96385dda87e0 /src/mainwin.cc | |
| parent | 94748bb8d2cb9943f2cfb0accb71fd64f73584fc (diff) | |
| parent | 69b48597eae52f9e2cf0dd7273a87287c97002b2 (diff) | |
Merge branch 'master' of https://github.com/meta23/openscad
Conflicts:
openscad.pro
Diffstat (limited to 'src/mainwin.cc')
| -rw-r--r-- | src/mainwin.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mainwin.cc b/src/mainwin.cc index 7e0a2f6..e217b1f 100644 --- a/src/mainwin.cc +++ b/src/mainwin.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 @@ -110,7 +111,7 @@ static char helptitle[] = QUOTED(OPENSCAD_VERSION) " (www.openscad.org)\n"; static char copyrighttext[] = - "Copyright (C) 2009 Clifford Wolf <clifford@clifford.at>\n" + "Copyright (C) 2009-2011 Marius Kintel <marius@kintel.net> and Clifford Wolf <clifford@clifford.at>\n" "\n" "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" |