yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge markers

Browse source
This commit is contained in:
David Edmundson 2016-11-28 10:17:07 +00:00
parent f34222e060
commit d06098ff30
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1,9 +1,5 @@
project(KWIN) project(KWIN)
<<<<<<< HEAD
set(PROJECT_VERSION "5.8.90") set(PROJECT_VERSION "5.8.90")
=======
set(PROJECT_VERSION "5.8.4")
>>>>>>> Plasma/5.8
set(PROJECT_VERSION_MAJOR 5) set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)