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

Conflicts:
	DesktopEditor/raster/Metafile/Emf/EmfFile.cpp

2017-05-27 15:27:51 +03:00

..

JBig2

test projects fix

2016-10-19 13:28:32 +03:00

Jp2

utf8 -> utf8 with BOM

2016-06-23 19:23:34 +03:00

Metafile

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

2017-05-27 15:27:51 +03:00

BgraFrame.cpp

OdfFormat - Reader/Writer - background page (image, pattern, gradient)

2017-02-05 15:57:17 +03:00

BgraFrame.h

OdfFormat - Reader/Writer - background page (image, pattern, gradient)

2017-02-05 15:57:17 +03:00

ImageFileFormatChecker.cpp

change license to 2017

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

ImageFileFormatChecker.h

change license to 2017

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

raster_vs2005.vcproj

..

2017-01-23 17:33:55 +03:00

raster.sln

.....

2016-05-20 23:54:08 +03:00

raster.vcproj

.....

2016-05-20 23:54:08 +03:00