[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdev-php-docs] /: Merge branch '1.4'
From:       Milian Wolff <mail () milianw ! de>
Date:       2012-10-16 16:45:37
Message-ID: 20121016164537.E6880A6078 () git ! kde ! org
[Download RAW message or body]

Git commit 6b3cf80099ccc0706f187a8906415901baa8b8f8 by Milian Wolff.
Committed on 16/10/2012 at 18:45.
Pushed by mwolff into branch 'master'.

Merge branch '1.4'

Conflicts:
	CMakeLists.txt

M  +4    -0    CMakeLists.txt

http://commits.kde.org/kdev-php-docs/6b3cf80099ccc0706f187a8906415901baa8b8f8

diff --cc CMakeLists.txt
index c40ee62,46b4e15..a1a2e3c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -10,7 -10,7 +10,11 @@@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PA
  enable_testing()
  
  find_package(KDE4 REQUIRED)
++<<<<<<< HEAD
 +find_package(KDevPlatform 1.4.60 REQUIRED)
++=======
+ find_package(KDevPlatform 1.4.0 REQUIRED)
++>>>>>>> 1.4
  include_directories(${KDEVPLATFORM_INCLUDE_DIR})
  
  include_directories(
[prev in list] [next in list] [prev in thread] [next in thread]