7 Commits

Author	SHA1	Message	Date
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
ElenaSubbotina	c64b624de2	.	2017-05-27 15:24:50 +03:00
ElenaSubbotina	21744c1607	.	2017-05-26 17:50:23 +03:00
ElenaSubbotina	0892e2549f	.	2017-05-26 17:48:13 +03:00
ElenaSubbotina	5060071227	fix bug #35006	2017-05-26 17:07:38 +03:00
ElenaSubbotina	c6ed59a742	EmfFile - fix emf from users file xlsx	2017-01-24 18:34:04 +03:00
ElenaSubbotina	8a41f0c716	............	2017-01-23 17:32:29 +03:00