Resolved conflicts

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 cppit (zippit)
+Copyright (c) 2015-2016 cppit (zippit)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,9 +1,9 @@
-# libclangmm - an easy to use C++-wrapper for libclang #
+# libclangmm - an easy-to-use C++ wrapper for libclang #
 
 ## About ##
 Provides C++ bindings and class structure to the [libclang](http://www.llvm.org) C library.
 
-Developed for [juCi++](https://github.com/cppit/jucipp) - a lightweight platform independent C++-IDE.
+Developed for [juCi++](https://github.com/cppit/jucipp), a lightweight, platform-independent C++ IDE.
 
 ## Dependencies ##
 * libclang

docs/install.md

@@ -13,7 +13,7 @@ make
 sudo make install
 ```
 
-## OS X with Homebrew (http://brew.sh/)
+## OS X with [Homebrew](http://brew.sh/)
 ```sh
 brew install cmake --with-clang llvm
 ```
@@ -26,13 +26,13 @@ make
 make install
 ```
 
-##Windows with MSYS2 (https://msys2.github.io/)
-Install dependencies (replace x86_64 with i686 for 32-bit MSYS2 installs):
+##Windows with [MSYS2](https://msys2.github.io/)
+Install dependencies (replace `x86_64` with `i686` for 32-bit MSYS2 installs):
 ```sh
 pacman -S git mingw-w64-x86_64-cmake make mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang
 ```
 
-Compile and install (replace mingw64 with mingw32 for 32-bit MSYS2 installs):
+Compile and install (replace `mingw64` with `mingw32` for 32-bit MSYS2 installs):
 ```sh
 git clone https://github.com/cppit/libclangmm.git
 cd libclangmm

tests/CMakeLists.txt

@@ -4,9 +4,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_HOME_DIRECTORY}/cmake/Modules/")
 
-ADD_DEFINITIONS(-DBOOST_TEST_STATIC_LINK) 
+add_definitions(-DBOOST_TEST_STATIC_LINK)
 
-message("Searcing for libclang")
+message("Searching for libclang")
 #LIBCLANG_FOUND System has libclang.
 #LIBCLANG_INCLUDE_DIRS The libclang include directories.
 #LIBCLANG_LIBRARIES  The libraries needed to use libclang.
@@ -33,4 +33,4 @@ set(tests
   ${project_tests}
   )
 
-add_test(${tests} ${tests})
+add_test(${tests} ${tests})