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

List:       kde-commits
Subject:    [plasma-desktop/amourphious/als] kcms/keyboard: Merge branch 'amourphious/als' of git://anongit.kde.
From:       shivam makkar <amourphious1992 () gmail ! com>
Date:       2014-05-29 19:59:54
Message-ID: E1Wq6UU-0007tW-Pg () scm ! kde ! org
[Download RAW message or body]

Git commit 088ffab9741b7cd452441a421b5b3a40f4c284f3 by shivam makkar.
Committed on 30/05/2014 at 01:27.
Pushed by makkar into branch 'amourphious/als'.

Merge branch 'amourphious/als' of git://anongit.kde.org/plasma-desktop into amourphious/als

Conflicts:
	kcms/keyboard/CMakeLists.txt
	kcms/keyboard/tests/CMakeLists.txt

M  +2    -1    kcms/keyboard/CMakeLists.txt
M  +8    -0    kcms/keyboard/tests/CMakeLists.txt

http://commits.kde.org/plasma-desktop/088ffab9741b7cd452441a421b5b3a40f4c284f3

diff --cc kcms/keyboard/CMakeLists.txt
index 70cd508,38022e8..69a576f
--- a/kcms/keyboard/CMakeLists.txt
+++ b/kcms/keyboard/CMakeLists.txt
@@@ -207,4 -207,4 +207,5 @@@ add_subdirectory( pics 
  
  # add_subdirectory( tests )
  
- add_subdirectory( LanguageDetection/langdata )
+ add_subdirectory( LanguageDetection/langdata )
++
diff --cc kcms/keyboard/tests/CMakeLists.txt
index c35f5c2,7f05ed7..0c6f71d
--- a/kcms/keyboard/tests/CMakeLists.txt
+++ b/kcms/keyboard/tests/CMakeLists.txt
@@@ -30,9 -24,7 +30,13 @@@ target_link_libraries(flags_tes
                        Qt5::Test
                        KF5::I18n
                        KF5::Plasma
++<<<<<<< HEAD
 +                      KF5::KDELibs4Support
 +                      XCB::XCB
 +                      XCB::XKB
++=======
+                       KF5::KDE4Support
++>>>>>>> 9baef77856bc3ea3ff1bfb886016b92311ae0cc9
                        ${X11_Xkbfile_LIB}
                        ${X11_LIBRARIES}
  )
@@@ -55,14 -44,7 +59,18 @@@ if( X11_XTest_FOUND 
                           KF5::CoreAddons
                           KF5::DBusAddons
                           KF5::Plasma
 +<<<<<<< HEAD
++<<<<<<< HEAD
 +                         KF5::KDELibs4Support
 +                         KF5::GlobalAccel
 +                         XCB::XCB
 +                         XCB::XKB
 +=======
                           KF5::KDE4Support
 +>>>>>>> added automatic layout switching, geometry preview and removed warnings at time of build and runtime
++=======
++                         KF5::KDE4Support
++>>>>>>> 9baef77856bc3ea3ff1bfb886016b92311ae0cc9
                           ${X11_Xkbfile_LIB}
                           ${X11_XTest_LIB}
                           ${X11_LIBRARIES}
[prev in list] [next in list] [prev in thread] [next in thread]