diff options
| author | Martin Owens <doctormo@gmail.com> | 2013-06-12 03:48:35 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2013-06-12 03:48:35 +0000 |
| commit | c34892c61ec3c5af7aae2cd3f5b64ddafd47e81c (patch) | |
| tree | 13874759631ef647b322a2b5d5210c0b66d1476e /src/trace/siox.cpp | |
| parent | Use 'remove' instead of 'gtk-remove' for theme. (diff) | |
| download | inkscape-c34892c61ec3c5af7aae2cd3f5b64ddafd47e81c.tar.gz inkscape-c34892c61ec3c5af7aae2cd3f5b64ddafd47e81c.zip | |
Fix Apache2 license conflict with GPL with re-license from SOIX upstream
Fixed bugs:
- https://launchpad.net/bugs/357043
(bzr r12370)
Diffstat (limited to 'src/trace/siox.cpp')
| -rw-r--r-- | src/trace/siox.cpp | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp index 1a1426b83..8c9130412 100644 --- a/src/trace/siox.cpp +++ b/src/trace/siox.cpp @@ -2,18 +2,8 @@ Copyright 2005, 2006 by Gerald Friedland, Kristian Jantz and Lars Knipping Conversion to C++ for Inkscape by Bob Jamison - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. + + Released under GNU GPL, read the file 'COPYING' for more information */ #include "siox.h" |