Diffusion Calligra 5c0a448e5f8e

Remove some errors from merging
5c0a448e5f8e
Actions

Authored by leinir on Oct 10 2017, 8:45 AM.

Tags

None

Subscribers

None

Description

Remove some errors from merging

Details

Committed

Oct 10 2017, 8:45 AM

Parents

R8:7acd5f0760eb: Merge branch 'master' into calligra-gemini-leinir

Branches

Unknown

Tags

Unknown

leinir committed R8:5c0a448e5f8e: Remove some errors from merging (authored by leinir).Oct 10 2017, 8:45 AM

leinir mentioned this in R8:1bbb6e00022b: Port Calligra Gemini for 3.x.Nov 8 2017, 2:17 PM

Changes (4)

				Path	Packages
	M			gemini/lib/CMakeLists.txt
	M			gemini/lib/GeminiMainWindow.cpp
	M			gemini/lib/GeminiMainWindow.h
	M			gemini/lib/GeminiModeSwitchEvent.h

R8:5c0a448e5f8e

gemini/lib/CMakeLists.txt

Loading...

gemini/lib/GeminiMainWindow.cpp

Loading...

gemini/lib/GeminiMainWindow.h

Loading...

gemini/lib/GeminiModeSwitchEvent.h

Loading...