Resolve merge conflicts with master branch

.clang-format

@@ -3,9 +3,9 @@ BasedOnStyle: Google
 IndentWidth:  4
 TabWidth:     8
 UseTab:       Never
-# NOTE(2019-02-23, uklotzde) The column limit has been set to 0
-# to avoid eagerly reformatting of the existing code base. This
-# may later be changed to 80-100 characters per line if desired.
+# A ColumnLimit > 0 causes clang-format to unbreaks all short lines,
+# which is undesired here.
+# If the line length exceeds 100, "ColumnLimit:  80" is used in scripts/line-length.py
 ColumnLimit:  0
 ---
 # Customize only those options that differ from the base style!

.gitignore

@@ -63,3 +63,6 @@ lib/*/lib/*.lib
 lib/qtscript-bytearray/*.cc
 
 compile_commands.json
+
+# Exclude documentation generated by Doxygen
+/doxygen/

.pre-commit-config.yaml

@@ -111,3 +111,14 @@ repos:
     - commit
     - push
     - manual
+- repo: local
+  hooks:
+  - id: line-length
+    name: line-length
+    description: Check for lines longer 100 and brakes them before 80.
+    entry: ./scripts/line_length.py
+    stages:
+    - commit
+    - push
+    language: python
+    files: \.(c|cpp|h)$

.travis.yml

@@ -1,6 +1,12 @@
-language: cpp
+# Enable build config validation (opt-in)
+version: ~> 1.0
+
+# Default build environment
 os: linux
+dist: bionic
 
+# Default programming language
+language: cpp
 
 # Build flags common to OS X and Linux.
 # Parallel builds are important for avoiding OSX build timeouts.
@@ -19,8 +25,6 @@ jobs:
   include:
     - name: pre-commit
       if: type != pull_request
-      os: linux
-      dist: xenial
       language: python
       python: 3.7
       # There are too many files in the repo that have formatting issues. We'll
@@ -38,8 +42,6 @@ jobs:
 
     - name: pre-commit-pr
       if: type == pull_request
-      os: linux
-      dist: xenial
       language: python
       python: 3.7
       cache:
@@ -52,10 +54,8 @@ jobs:
       addons: []
 
     - name: Ubuntu/gcc/SCons build
-      os: linux
-      dist: xenial
       compiler: gcc
-      # Ubuntu Xenial build prerequisites
+      # Ubuntu Bionic build prerequisites
       before_install:
         - sudo apt-get install -y scons
       install:
@@ -67,11 +67,9 @@ jobs:
         - ./mixxx-test
 
     - name: Ubuntu/gcc/CMake build
-      os: linux
-      dist: xenial
       compiler: gcc
       cache: ccache
-      # Ubuntu Xenial build prerequisites
+      # Ubuntu Bionic build prerequisites
       env: CMAKEFLAGS_EXTRA="-DLOCALECOMPARE=ON"
       before_install:
         - export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)"
@@ -93,7 +91,8 @@ jobs:
 
     - name: OSX/clang/SCons build
       os: osx
-      osx_image: xcode11
+      # The XCode version should match that on the build server!
+      osx_image: xcode9.4
       compiler: clang
       cache:
         directories:
@@ -129,7 +128,8 @@ jobs:
 
     - name: OSX/clang/CMake build
       os: osx
-      osx_image: xcode11
+      # The XCode version should match that on the build server!
+      osx_image: xcode9.4
       compiler: clang
       cache:
         ccache: true

CHANGELOG.md

@@ -38,6 +38,8 @@
 * Add controller mapping for Native Instruments Traktor Kontrol S2 MK3 #2348
 * Add controller mapping for Soundless joyMIDI #2425
 * Add controller mapping for Hercules DJControl Inpulse 300 #2465
+* Add controller mapping for Denon MC7000 #2546
+* Add controller mapping for Stanton DJC.4 #2607
 
 ## [2.2.3](https://launchpad.net/mixxx/+milestone/2.2.3) (2019-11-24)