corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [38/38] incubator-corinthia git commit: merge new license headers
Date Fri, 13 Feb 2015 08:52:50 GMT
merge new license headers

Merge branch 'master' into experimentZip

Conflicts:
	DocFormats/platform/src/Apple.c
	DocFormats/platform/src/Linux.c
	DocFormats/platform/src/Unix.c
	DocFormats/platform/src/Win32.c
	DocFormats/platform/src/Wrapper.c
	DocFormats/platform/tests/OStests.c
	DocFormats/platform/tests/WrapperTests.c


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/302d5412
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/302d5412
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/302d5412

Branch: refs/heads/experimentZip
Commit: 302d5412dddb755d47552c905eb9c6122a7cf3c0
Parents: 5b46b74 8fbfeca
Author: jani <jani@apache.org>
Authored: Fri Feb 13 09:51:15 2015 +0100
Committer: jani <jani@apache.org>
Committed: Fri Feb 13 09:51:15 2015 +0100

----------------------------------------------------------------------
 DocFormats/DocFormats.c                         |  17 +++++++++++++
 DocFormats/api/headers/DocFormats/DFError.h     |  25 +++++++++++--------
 DocFormats/api/headers/DocFormats/DFStorage.h   |  25 +++++++++++--------
 .../api/headers/DocFormats/DFXMLForward.h       |  25 +++++++++++--------
 DocFormats/api/headers/DocFormats/DocFormats.h  |  25 +++++++++++--------
 DocFormats/api/headers/DocFormats/Formats.h     |  25 +++++++++++--------
 DocFormats/api/headers/DocFormats/Operations.h  |  25 +++++++++++--------
 DocFormats/api/src/Formats.c                    |  25 +++++++++++--------
 DocFormats/api/src/Operations.c                 |  25 +++++++++++--------
 DocFormats/api/tests/APITests.c                 |  25 +++++++++++--------
 DocFormats/core/src/common/DFBDT.c              |  25 +++++++++++--------
 DocFormats/core/src/common/DFBDT.h              |  25 +++++++++++--------
 DocFormats/core/src/common/DFClassNames.h       |  25 +++++++++++--------
 DocFormats/core/src/common/DFTable.c            |  25 +++++++++++--------
 DocFormats/core/src/common/DFTable.h            |  25 +++++++++++--------
 DocFormats/core/src/css/CSS.c                   |  25 +++++++++++--------
 DocFormats/core/src/css/CSS.h                   |  25 +++++++++++--------
 DocFormats/core/src/css/CSSLength.c             |  25 +++++++++++--------
 DocFormats/core/src/css/CSSLength.h             |  25 +++++++++++--------
 DocFormats/core/src/css/CSSParser.c             |  25 +++++++++++--------
 DocFormats/core/src/css/CSSParser.h             |  25 +++++++++++--------
 DocFormats/core/src/css/CSSProperties.c         |  25 +++++++++++--------
 DocFormats/core/src/css/CSSProperties.h         |  25 +++++++++++--------
 DocFormats/core/src/css/CSSSelector.c           |  25 +++++++++++--------
 DocFormats/core/src/css/CSSSelector.h           |  25 +++++++++++--------
 DocFormats/core/src/css/CSSSheet.c              |  25 +++++++++++--------
 DocFormats/core/src/css/CSSSheet.h              |  25 +++++++++++--------
 DocFormats/core/src/css/CSSStyle.c              |  25 +++++++++++--------
 DocFormats/core/src/css/CSSStyle.h              |  25 +++++++++++--------
 DocFormats/core/src/css/CSSSyntax.c             |  25 +++++++++++--------
 DocFormats/core/src/css/CSSSyntax.h             |  25 +++++++++++--------
 DocFormats/core/src/html/DFHTDocument.c         |  25 +++++++++++--------
 DocFormats/core/src/html/DFHTDocument.h         |  25 +++++++++++--------
 DocFormats/core/src/html/DFHTML.c               |  25 +++++++++++--------
 DocFormats/core/src/html/DFHTML.h               |  25 +++++++++++--------
 DocFormats/core/src/html/DFHTMLNormalization.c  |  25 +++++++++++--------
 DocFormats/core/src/html/DFHTMLNormalization.h  |  25 +++++++++++--------
 DocFormats/core/src/html/DFHTMLTables.c         |  25 +++++++++++--------
 DocFormats/core/src/html/DFHTMLTables.h         |  25 +++++++++++--------
 DocFormats/core/src/html/DFTidyHelper.c         |  25 +++++++++++--------
 DocFormats/core/src/html/DFTidyHelper.h         |  25 +++++++++++--------
 DocFormats/core/src/html/DFTidyWrapper.c        |  25 +++++++++++--------
 DocFormats/core/src/html/DFTidyWrapper.h        |  25 +++++++++++--------
 DocFormats/core/src/lib/DFAllocator.c           |  25 +++++++++++--------
 DocFormats/core/src/lib/DFAllocator.h           |  25 +++++++++++--------
 DocFormats/core/src/lib/DFArray.c               |  25 +++++++++++--------
 DocFormats/core/src/lib/DFArray.h               |  25 +++++++++++--------
 DocFormats/core/src/lib/DFBuffer.c              |  25 +++++++++++--------
 DocFormats/core/src/lib/DFBuffer.h              |  25 +++++++++++--------
 DocFormats/core/src/lib/DFCallback.c            |  25 +++++++++++--------
 DocFormats/core/src/lib/DFCallback.h            |  25 +++++++++++--------
 DocFormats/core/src/lib/DFCharacterSet.c        |  25 +++++++++++--------
 DocFormats/core/src/lib/DFCharacterSet.h        |  25 +++++++++++--------
 DocFormats/core/src/lib/DFError.c               |  25 +++++++++++--------
 DocFormats/core/src/lib/DFFilesystem.c          |  25 +++++++++++--------
 DocFormats/core/src/lib/DFFilesystem.h          |  25 +++++++++++--------
 DocFormats/core/src/lib/DFHashTable.c           |  25 +++++++++++--------
 DocFormats/core/src/lib/DFHashTable.h           |  25 +++++++++++--------
 DocFormats/core/src/lib/DFStorage.c             |  25 +++++++++++--------
 DocFormats/core/src/lib/DFString.c              |  25 +++++++++++--------
 DocFormats/core/src/lib/DFString.h              |  25 +++++++++++--------
 DocFormats/core/src/lib/DFZipFile.c             |  25 +++++++++++--------
 DocFormats/core/src/lib/DFZipFile.h             |  25 +++++++++++--------
 DocFormats/core/src/lib/TextPackage.c           |  25 +++++++++++--------
 DocFormats/core/src/lib/TextPackage.h           |  25 +++++++++++--------
 DocFormats/core/src/xml/DFChanges.c             |  25 +++++++++++--------
 DocFormats/core/src/xml/DFChanges.h             |  25 +++++++++++--------
 DocFormats/core/src/xml/DFDOM.c                 |  25 +++++++++++--------
 DocFormats/core/src/xml/DFDOM.h                 |  25 +++++++++++--------
 DocFormats/core/src/xml/DFMarkupCompatibility.c |  25 +++++++++++--------
 DocFormats/core/src/xml/DFMarkupCompatibility.h |  25 +++++++++++--------
 DocFormats/core/src/xml/DFNameMap.c             |  25 +++++++++++--------
 DocFormats/core/src/xml/DFNameMap.h             |  25 +++++++++++--------
 DocFormats/core/src/xml/DFXML.c                 |  25 +++++++++++--------
 DocFormats/core/src/xml/DFXML.h                 |  25 +++++++++++--------
 DocFormats/core/tests/common/BDTTests.c         |  25 +++++++++++--------
 DocFormats/core/tests/common/BDTTests.h         |  25 +++++++++++--------
 DocFormats/core/tests/css/CSSTests.c            |  25 +++++++++++--------
 DocFormats/core/tests/html/HTMLPlain.c          |  25 +++++++++++--------
 DocFormats/core/tests/html/HTMLPlain.h          |  25 +++++++++++--------
 DocFormats/core/tests/html/HTMLTests.c          |  25 +++++++++++--------
 DocFormats/core/tests/lib/LibTests.c            |  25 +++++++++++--------
 DocFormats/core/tests/xml/XMLTests.c            |  25 +++++++++++--------
 DocFormats/filters/latex/src/HTMLToLaTeX.c      |  25 +++++++++++--------
 DocFormats/filters/latex/src/HTMLToLaTeX.h      |  25 +++++++++++--------
 DocFormats/filters/latex/tests/LaTeXTests.c     |  25 +++++++++++--------
 DocFormats/filters/odf/src/ODF.c                |  25 +++++++++++--------
 DocFormats/filters/odf/src/ODF.h                |  25 +++++++++++--------
 DocFormats/filters/odf/src/ODFManifest.c        |  25 +++++++++++--------
 DocFormats/filters/odf/src/ODFManifest.h        |  25 +++++++++++--------
 DocFormats/filters/odf/src/ODFPackage.c         |  25 +++++++++++--------
 DocFormats/filters/odf/src/ODFPackage.h         |  25 +++++++++++--------
 DocFormats/filters/odf/src/ODFSheet.c           |  25 +++++++++++--------
 DocFormats/filters/odf/src/ODFSheet.h           |  25 +++++++++++--------
 DocFormats/filters/odf/src/text/ODFText.c       |  25 +++++++++++--------
 DocFormats/filters/odf/src/text/ODFText.h       |  25 +++++++++++--------
 DocFormats/filters/odf/tests/ODFTests.c         |  25 +++++++++++--------
 .../filters/ooxml/src/common/OOXMLTypedefs.h    |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/common/OPC.c       |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/common/OPC.h       |  25 +++++++++++--------
 .../filters/ooxml/src/word/CSSClassNames.c      |  25 +++++++++++--------
 .../filters/ooxml/src/word/CSSClassNames.h      |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/Word.c        |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/Word.h        |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordCaption.c |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordCaption.h |  25 +++++++++++--------
 .../filters/ooxml/src/word/WordConverter.c      |  25 +++++++++++--------
 .../filters/ooxml/src/word/WordConverter.h      |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordGC.c      |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordGC.h      |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordLists.c   |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordLists.h   |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordNotes.c   |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordNotes.h   |  25 +++++++++++--------
 .../filters/ooxml/src/word/WordNumbering.c      |  25 +++++++++++--------
 .../filters/ooxml/src/word/WordNumbering.h      |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordObjects.c |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordObjects.h |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordPackage.c |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordPackage.h |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordSection.c |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordSection.h |  25 +++++++++++--------
 .../filters/ooxml/src/word/WordSettings.c       |  25 +++++++++++--------
 .../filters/ooxml/src/word/WordSettings.h       |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordSheet.c   |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordSheet.h   |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordStyles.c  |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordStyles.h  |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordTheme.c   |  25 +++++++++++--------
 DocFormats/filters/ooxml/src/word/WordTheme.h   |  25 +++++++++++--------
 .../filters/ooxml/src/word/WordWhitespace.c     |  25 +++++++++++--------
 .../filters/ooxml/src/word/WordWhitespace.h     |  25 +++++++++++--------
 .../ooxml/src/word/formatting/WordCommonPr.c    |  25 +++++++++++--------
 .../ooxml/src/word/formatting/WordCommonPr.h    |  25 +++++++++++--------
 .../ooxml/src/word/formatting/WordNumPr.c       |  25 +++++++++++--------
 .../ooxml/src/word/formatting/WordNumPr.h       |  25 +++++++++++--------
 .../filters/ooxml/src/word/formatting/WordPPr.c |  25 +++++++++++--------
 .../filters/ooxml/src/word/formatting/WordPPr.h |  25 +++++++++++--------
 .../filters/ooxml/src/word/formatting/WordRPr.c |  25 +++++++++++--------
 .../filters/ooxml/src/word/formatting/WordRPr.h |  25 +++++++++++--------
 .../ooxml/src/word/formatting/WordTblPr.c       |  25 +++++++++++--------
 .../ooxml/src/word/formatting/WordTblPr.h       |  25 +++++++++++--------
 .../ooxml/src/word/lenses/WordBlockLevel.c      |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordBody.c    |  25 +++++++++++--------
 .../ooxml/src/word/lenses/WordBookmark.c        |  25 +++++++++++--------
 .../ooxml/src/word/lenses/WordBookmark.h        |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordChange.c  |  25 +++++++++++--------
 .../ooxml/src/word/lenses/WordDocument.c        |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordDrawing.c |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordDrawing.h |  25 +++++++++++--------
 .../ooxml/src/word/lenses/WordEquation.c        |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordField.c   |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordField.h   |  25 +++++++++++--------
 .../ooxml/src/word/lenses/WordHyperlink.c       |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordLenses.c  |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordLenses.h  |  25 +++++++++++--------
 .../ooxml/src/word/lenses/WordParagraph.c       |  25 +++++++++++--------
 .../src/word/lenses/WordParagraphContent.c      |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordRun.c     |  25 +++++++++++--------
 .../ooxml/src/word/lenses/WordRunContent.c      |  25 +++++++++++--------
 .../ooxml/src/word/lenses/WordSmartTag.c        |  25 +++++++++++--------
 .../filters/ooxml/src/word/lenses/WordTable.c   |  25 +++++++++++--------
 DocFormats/filters/ooxml/tests/word/WordPlain.c |  25 +++++++++++--------
 DocFormats/filters/ooxml/tests/word/WordPlain.h |  25 +++++++++++--------
 DocFormats/filters/ooxml/tests/word/WordTests.c |  25 +++++++++++--------
 DocFormats/headers/DFCommon.h                   |  25 +++++++++++--------
 DocFormats/headers/DFCore.h                     |  25 +++++++++++--------
 DocFormats/headers/DFPlatform.h                 |  25 +++++++++++--------
 DocFormats/headers/DFTypes.h                    |  25 +++++++++++--------
 DocFormats/platform/src/Apple.c                 |  23 ++++++++++++-----
 DocFormats/platform/src/Linux.c                 |  23 ++++++++++++-----
 DocFormats/platform/src/Unix.c                  |  23 ++++++++++++-----
 DocFormats/platform/src/Win32.c                 |  23 ++++++++++++-----
 DocFormats/platform/src/Wrapper.c               |  24 +++++++++++++-----
 DocFormats/platform/tests/OStests.c             |  23 ++++++++++++-----
 DocFormats/platform/tests/WrapperTests.c        |  24 +++++++++++++-----
 DocFormats/unittest/DFUnitTest.c                |  25 +++++++++++--------
 DocFormats/unittest/DFUnitTest.h                |  25 +++++++++++--------
 Editor/src/AutoCorrect.js                       |  25 +++++++++++--------
 Editor/src/ChangeTracking.js                    |  25 +++++++++++--------
 Editor/src/Clipboard.js                         |  25 +++++++++++--------
 Editor/src/Cursor.js                            |  25 +++++++++++--------
 Editor/src/DOM.js                               |  25 +++++++++++--------
 Editor/src/Editor.js                            |  25 +++++++++++--------
 Editor/src/Equations.js                         |  25 +++++++++++--------
 Editor/src/Figures.js                           |  25 +++++++++++--------
 Editor/src/Formatting.js                        |  25 +++++++++++--------
 Editor/src/Hierarchy.js                         |  25 +++++++++++--------
 Editor/src/Input.js                             |  25 +++++++++++--------
 Editor/src/Lists.js                             |  25 +++++++++++--------
 Editor/src/Main.js                              |  25 +++++++++++--------
 Editor/src/Metadata.js                          |  25 +++++++++++--------
 Editor/src/NodeSet.js                           |  25 +++++++++++--------
 Editor/src/Outline.js                           |  25 +++++++++++--------
 Editor/src/Position.js                          |  25 +++++++++++--------
 Editor/src/PostponedActions.js                  |  25 +++++++++++--------
 Editor/src/Preview.js                           |  25 +++++++++++--------
 Editor/src/Range.js                             |  25 +++++++++++--------
 Editor/src/Scan.js                              |  25 +++++++++++--------
 Editor/src/Selection.js                         |  25 +++++++++++--------
 Editor/src/StringBuilder.js                     |  25 +++++++++++--------
 Editor/src/Styles.js                            |  25 +++++++++++--------
 Editor/src/Tables.js                            |  25 +++++++++++--------
 Editor/src/Text.js                              |  25 +++++++++++--------
 Editor/src/UndoManager.js                       |  25 +++++++++++--------
 Editor/src/Viewport.js                          |  25 +++++++++++--------
 Editor/src/first.js                             |  25 +++++++++++--------
 Editor/src/traversal.js                         |  25 +++++++++++--------
 Editor/src/types.js                             |  25 +++++++++++--------
 Editor/src/util.js                              |  25 +++++++++++--------
 Editor/tests/PrettyPrinter.js                   |  25 +++++++++++--------
 Editor/tests/autocorrect/AutoCorrectTests.js    |  25 +++++++++++--------
 Editor/tests/dom/RangeTest.js                   |  25 +++++++++++--------
 Editor/tests/figures/FiguresTest.js             |  25 +++++++++++--------
 Editor/tests/input/InputTests.js                |  25 +++++++++++--------
 Editor/tests/outline/OutlineTest.js             |  25 +++++++++++--------
 Editor/tests/position/validPositions.js         |  25 +++++++++++--------
 Editor/tests/scan/ScanTests.js                  |  25 +++++++++++--------
 Editor/tests/selection/PositionTests.js         |  25 +++++++++++--------
 Editor/tests/server.js                          |  25 +++++++++++--------
 Editor/tests/tables/TableTests.js               |  25 +++++++++++--------
 Editor/tests/test-structure.html                |  19 +++++++++++++-
 Editor/tests/testharness.js                     |  25 +++++++++++--------
 Editor/tests/testlib.js                         |  25 +++++++++++--------
 Editor/tests/text/TextTests.js                  |  25 +++++++++++--------
 Editor/tests/undo/UndoTests.js                  |  25 +++++++++++--------
 NOTICE.txt                                      |   7 ++++++
 build/build_instructions.txt                    | Bin 7208 -> 0 bytes
 consumers/dfconvert/src/main.c                  |  25 +++++++++++--------
 consumers/dftest/src/main.c                     |  25 +++++++++++--------
 consumers/dfutil/src/Commands.c                 |  25 +++++++++++--------
 consumers/dfutil/src/Commands.h                 |  25 +++++++++++--------
 consumers/dfutil/src/FunctionTests.h            |  25 +++++++++++--------
 consumers/dfutil/src/FunctionTests.m            |  25 +++++++++++--------
 consumers/dfutil/src/StringTests.h              |  25 +++++++++++--------
 consumers/dfutil/src/StringTests.m              |  25 +++++++++++--------
 consumers/dfutil/src/dfutil-Prefix.pch          |   7 ------
 consumers/dfutil/src/main.c                     |  25 +++++++++++--------
 schemas/createimpl.js                           |  25 +++++++++++--------
 schemas/relaxng.js                              |  25 +++++++++++--------
 240 files changed, 3355 insertions(+), 2558 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/302d5412/DocFormats/platform/src/Apple.c
----------------------------------------------------------------------
diff --cc DocFormats/platform/src/Apple.c
index 392dd64,576743f..e6e74ed
--- a/DocFormats/platform/src/Apple.c
+++ b/DocFormats/platform/src/Apple.c
@@@ -1,14 -1,19 +1,25 @@@
++<<<<<<< HEAD
 +// 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
++=======
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you 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
+ //   http://www.apache.org/licenses/LICENSE-2.0
++>>>>>>> master
  //
- // 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.
+ // 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.
  
  #include "DFPlatform.h"
  

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/302d5412/DocFormats/platform/src/Linux.c
----------------------------------------------------------------------
diff --cc DocFormats/platform/src/Linux.c
index 8d3064b,8f01264..11dd582
--- a/DocFormats/platform/src/Linux.c
+++ b/DocFormats/platform/src/Linux.c
@@@ -1,14 -1,19 +1,25 @@@
++<<<<<<< HEAD
 +// 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
++=======
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you 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
+ //   http://www.apache.org/licenses/LICENSE-2.0
++>>>>>>> master
  //
- // 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.
+ // 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.
  
  #include "DFPlatform.h"
  

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/302d5412/DocFormats/platform/src/Unix.c
----------------------------------------------------------------------
diff --cc DocFormats/platform/src/Unix.c
index 80655eb,a739875..63f3c8f
--- a/DocFormats/platform/src/Unix.c
+++ b/DocFormats/platform/src/Unix.c
@@@ -1,14 -1,19 +1,25 @@@
++<<<<<<< HEAD
 +// 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
++=======
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you 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
+ //   http://www.apache.org/licenses/LICENSE-2.0
++>>>>>>> master
  //
- // 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.
+ // 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.
  
  #include "DFPlatform.h"
  #include <errno.h>

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/302d5412/DocFormats/platform/src/Win32.c
----------------------------------------------------------------------
diff --cc DocFormats/platform/src/Win32.c
index a319620,6ac5215..4616123
--- a/DocFormats/platform/src/Win32.c
+++ b/DocFormats/platform/src/Win32.c
@@@ -1,14 -1,19 +1,25 @@@
++<<<<<<< HEAD
 +// 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
++=======
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you 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
+ //   http://www.apache.org/licenses/LICENSE-2.0
++>>>>>>> master
  //
- // 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.
+ // 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.
  
  #include "DFPlatform.h"
  

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/302d5412/DocFormats/platform/src/Wrapper.c
----------------------------------------------------------------------
diff --cc DocFormats/platform/src/Wrapper.c
index 827a7d1,1c0d897..5dcce7e
--- a/DocFormats/platform/src/Wrapper.c
+++ b/DocFormats/platform/src/Wrapper.c
@@@ -1,14 -1,20 +1,26 @@@
++<<<<<<< HEAD
 +// 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
++=======
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you 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
+ //   http://www.apache.org/licenses/LICENSE-2.0
++>>>>>>> master
  //
- // 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.
+ // 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.
+ 
  #include <string.h>
  #include <stdlib.h>
  #include "DFPlatform.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/302d5412/DocFormats/platform/tests/OStests.c
----------------------------------------------------------------------
diff --cc DocFormats/platform/tests/OStests.c
index b3a5c21,27aafe4..9b76045
--- a/DocFormats/platform/tests/OStests.c
+++ b/DocFormats/platform/tests/OStests.c
@@@ -1,14 -1,19 +1,25 @@@
++<<<<<<< HEAD
 +// 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
++=======
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you 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
+ //   http://www.apache.org/licenses/LICENSE-2.0
++>>>>>>> master
  //
- // 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.
+ // 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.
  
  #include "DFUnitTest.h"
  #include "DFPlatform.h"

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/302d5412/DocFormats/platform/tests/WrapperTests.c
----------------------------------------------------------------------
diff --cc DocFormats/platform/tests/WrapperTests.c
index b09e865,5f5d74b..f3f26b4
--- a/DocFormats/platform/tests/WrapperTests.c
+++ b/DocFormats/platform/tests/WrapperTests.c
@@@ -1,14 -1,20 +1,26 @@@
++<<<<<<< HEAD
 +// 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
++=======
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you 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
+ //   http://www.apache.org/licenses/LICENSE-2.0
++>>>>>>> master
  //
- // 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.
+ // 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.
+ 
  #include "DFUnitTest.h"
  #include <stddef.h>
  


Mime
View raw message