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

..

EmfClip.cpp

change license to 2017

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

EmfClip.h

change license to 2017

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

EmfFile.cpp

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

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

EmfFile.h

..

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

EmfObjects.cpp

change license to 2017

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

EmfObjects.h

..

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

EmfPath.cpp

change license to 2017

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

EmfPath.h

change license to 2017

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

EmfPlayer.cpp

change license to 2017

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

EmfPlayer.h

change license to 2017

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

EmfTypes.h

fix bug #35006

2017-05-26 17:07:38 +03:00