Merge branch 'master' of github.com:musescore/MuseScore

Conflicts:
	CMakeLists.txt
	README.md

.travis.yml

@@ -0,0 +1,29 @@
+before_install:
+  # rm the rabbitmq source file since it currently times out and we don't need it
+  - "sudo rm -f /etc/apt/sources.list.d/rabbitmq-source.list"
+  - "sudo add-apt-repository -y ppa:kubuntu-ppa/backports"
+  - "sudo add-apt-repository -y ppa:julien-malik/cmake"
+  - "sudo apt-get update"
+  - "sudo apt-get install -y libqt4-dev"
+  - "sudo apt-get install -y alsa libsndfile1 make cmake g++ ant"
+  - "sudo apt-get install -y libasound2-dev portaudio19-dev libsndfile1-dev zlib1g-dev libfreetype6-dev libfontconfig-dev"
+  - "sudo apt-get install -y lame libmp3lame-dev"
+before_script: 
+  - "make"
+  - "sudo make install"
+  - "cd build.release/mtest"
+script:
+  - "make && xvfb-run ctest"
+notifications:
+  recipients:
+    - build@musescore.org
+  email:
+    on_success: change
+    on_failure: always
+  irc:
+    channels:
+      - "irc.freenode.net#musescore"
+    on_success: change
+    on_failure: change
+
+

CMakeLists.txt

@@ -351,6 +351,7 @@ else (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
       endif (MINGW)
 endif (CMAKE_BUILD_TYPE STREQUAL "DEBUG")
 
+<<<<<<< HEAD
 if (${CMAKE_CXX_COMPILER_ID} EQUAL "Clang")
       add_custom_command(
          OUTPUT ${PROJECT_BINARY_DIR}/all.h.pch
@@ -374,6 +375,19 @@ else (${CMAKE_CXX_COMPILER_ID} EQUAL "Clang")
          )
       set (PCH ${PROJECT_BINARY_DIR}/all.h.gch)
 endif(${CMAKE_CXX_COMPILER_ID} EQUAL "Clang")
+=======
+
+add_custom_command(
+ OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
+ COMMAND ${CMAKE_CXX_COMPILER}
+   -x c++-header -g  ${FLAGS}
+   -I${QT_HEADERS_DIR}
+   -o all.h.gch all.h
+ DEPENDS ${PROJECT_BINARY_DIR}/all.h
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+ )
+set (PCH ${PROJECT_BINARY_DIR}/all.h.gch)
+>>>>>>> ecabd2aa890bcbada78bfcb18e29019e9caa65a2
 
 
 ADD_CUSTOM_TARGET(mops1 DEPENDS ${PROJECT_BINARY_DIR}/all.h)

README.md

@@ -1,8 +1,10 @@
 MuseScore
-======
+
+MuseScore [![Build Status](https://secure.travis-ci.org/musescore/MuseScore.png)](http://travis-ci.org/musescore/MuseScore)
 
 MuseScore [free music notation software](http://musescore.org). http://musescore.org
 
+>>>>>>> ecabd2aa890bcbada78bfcb18e29019e9caa65a2
 * **aeolus** Clone of [Aeolus](http://users.skynet.be/solaris/linuxaudio/aeolus.html)
 
 * **awl** Audio Widget Library, from the MusE project