ElenaSubbotina 008382213b Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop ...

Conflicts:
	Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.h

2018-01-12 12:13:38 +03:00

..

3dParty

.

2017-12-22 15:10:45 +03:00

DocxFormat

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

2018-01-12 12:13:38 +03:00

empty

Added empty files

2017-10-06 11:04:59 +03:00

FileDownloader

builder error (save to pdf & open file by url)

2017-12-01 14:23:21 +03:00

ASCATLError.h

change license to 2017

2017-01-17 18:17:26 +03:00

ASCUtils.h

change license to 2017

2017-01-17 18:17:26 +03:00

ASCUtilsDefines.h

change license to 2017

2017-01-17 18:17:26 +03:00

ATLDefine.h

change license to 2017

2017-01-17 18:17:26 +03:00

Base64.h

change license to 2017

2017-01-17 18:17:26 +03:00

base.pri

Added multithread flag

2017-08-24 19:37:22 +03:00

FileWriter.h

change license to 2017

2017-01-17 18:17:26 +03:00

MediaFormatDefine.h

change license to 2017

2017-01-17 18:17:26 +03:00

MS-LCID.h

change license to 2017

2017-01-17 18:17:26 +03:00

OfficeDefines.h

change license to 2017

2017-01-17 18:17:26 +03:00

OfficeFileErrorDescription.h

x2t - options for check macro in file

2017-12-05 16:56:50 +03:00

OfficeFileFormatChecker2.cpp

Merge pull request #55 from ONLYOFFICE/feature/v5.0.7.1

2017-12-06 18:54:01 +03:00

OfficeFileFormatChecker.h

x2t - options for check macro in file

2017-12-05 16:56:50 +03:00

OfficeFileFormats.h

OdfFormatReader - support pilot(pivot) tables

2017-09-19 18:20:33 +03:00

OfficeFileTemplate.h

change license to 2017

2017-01-17 18:17:26 +03:00

VideoFileErrorDescription.h

change license to 2017

2017-01-17 18:17:26 +03:00