Merge branch 'master' into release

Author: dg0yt

.gitattributes

@@ -1,8 +1,7 @@
 .gitignore           export-ignore
 .gitattributes       export-ignore
-*.omap               binary diff=xmllint
 *.ocd                binary
-*.ts                 binary diff=xmllint
+#*.ts                 binary diff=xmllint
 3rd-party/*          linguist-vendored
 doc/*                linguist-documentation
 help/*               linguist-documentation

3rd-party/clipper/clipper.pro

@@ -0,0 +1,127 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Clipper
+Upstream-Contact: Angus Johnson <http://sourceforge.net/projects/polyclipping>
+Source: http://sourceforge.net/projects/polyclipping
+
+Files: *
+Copyright: Copyright 2010-2013 Angus Johnson
+License: boost
+ The Clipper Library (including Delphi, C++ & C# source code, other accompanying
+ code, examples and documentation), hereafter called "the Software", has been 
+ released under the following license, terms and conditions:
+ .
+ Boost Software License - Version 1.0 - August 17th, 2003
+ http://www.boost.org/LICENSE_1_0.txt
+ .
+ Permission is hereby granted, free of charge, to any person or organization 
+ obtaining a copy of the Software covered by this license to use, reproduce, 
+ display, distribute, execute, and transmit the Software, and to prepare 
+ derivative works of the Software, and to permit third-parties to whom the 
+ Software is furnished to do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including the 
+ above license grant, this restriction and the following disclaimer, must be 
+ included in all copies of the Software, in whole or in part, and all derivative 
+ works of the Software, unless such copies or derivative works are solely in the 
+ form of machine-executable object code generated by a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL 
+ THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY 
+ DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING 
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+ THE SOFTWARE.
+
+Files: Documentation/Scripts/SyntaxHighlighter/*
+Copyright: Copyright (C) 2004-2010 Alex Gorbatchev.
+License: MIT or GPL
+
+Files: Documentation/Scripts/SyntaxHighlighter/scripts/shBrushCpp.js
+Copyright:
+ Copyright (C) 2004-2010 Alex Gorbatchev.
+ Copyright 2006 Shin, YoungJin
+License: MIT or GPL
+
+Files: Documentation/Scripts/SyntaxHighlighter/tests/js/jquery-1.4.2.js
+Copyright:
+ Copyright 2010, John Resig
+ Copyright 2009, 2010 The Dojo Foundation
+License: MIT
+
+Files: Documentation/Scripts/SyntaxHighlighter/tests/js/qunit.js
+Copyright:
+ Copyright (c) 2009 John Resig, Jörn Zaefferer
+ Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+License: MIT or GPL, and BSD
+ 
+Files: debian/*
+Copyright: Copyright 2003-2011 Bas Wijnen <[email protected]>
+License: GPL-3+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ The latest version of the GPL can be found in
+ /usr/share/common-licenses/GPL.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: GPL
+ 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
+ the Free Software Foundation, either version 1 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the latest version of the GPL can be found in
+ /usr/share/common-licenses/GPL
+
+License: BSD
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ Redistributions in binary form must reproduce the above copyright notice, this
+ list of conditions and the following disclaimer in the documentation and/or
+ other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.