Merging Tileson to Master

.kdev4/BeagleRescue.git.kdev4

@@ -1,5 +1,6 @@
+<<<<<<< HEAD
 [Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x18\x00B\x00e\x00a\x00g\x00l\x00e\x00R\x00e\x00s\x00c\x00u\x00e)
+BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00 \x00B\x00e\x00a\x00g\x00l\x00e\x00R\x00e\x00s\x00c\x00u\x00e\x00.\x00g\x00i\x00t)
 
 [CMake]
 Build Directory Count=1
@@ -12,7 +13,7 @@ CMake Binary=/usr/bin/cmake
 CMake Executable=/usr/bin/cmake
 Environment Profile=
 Extra Arguments=
-Install Directory=/usr/local
+Install Directory=
 Runtime=Host System
 
 [CustomDefinesAndIncludes][ProjectPath0]
@@ -60,3 +61,34 @@ isExecutable=true
 
 [Project]
 VersionControlSupport=kdevgit
+||||||| 8aa7974
+=======
+[Buildset]
+BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00 \x00B\x00e\x00a\x00g\x00l\x00e\x00R\x00e\x00s\x00c\x00u\x00e\x00.\x00g\x00i\x00t)
+
+[CMake]
+Build Directory Count=1
+Current Build Directory Index-Host System=0
+
+[CMake][CMake Build Directory 0]
+Build Directory Path=/home/ayoungblood/projects/BeagleRescue.git/build
+Build Type=Release
+CMake Binary=/usr/bin/cmake
+CMake Executable=/usr/bin/cmake
+Environment Profile=
+Extra Arguments=
+Install Directory=
+Runtime=Host System
+
+[Launch]
+Launch Configurations=Launch Configuration 0
+
+[Launch][Launch Configuration 0]
+Configured Launch Modes=execute
+Configured Launchers=nativeAppLauncher
+Name=New Compiled Binary Launcher
+Type=Native Application
+
+[Project]
+VersionControlSupport=kdevgit
+>>>>>>> a3d13f32a5f0e4e11c618a4c3d524fd52fc0ed08

BeagleRescue.git.kdev4

@@ -1,4 +1,12 @@
+<<<<<<< HEAD
 [Project]
 CreatedFrom=CMakeLists.txt
 Manager=KDevCMakeManager
 Name=BeagleRescue
+||||||| 8aa7974
+=======
+[Project]
+CreatedFrom=CMakeLists.txt
+Manager=KDevCMakeManager
+Name=BeagleRescue.git
+>>>>>>> a3d13f32a5f0e4e11c618a4c3d524fd52fc0ed08