Joshua Bonn@DESKTOP-RPS5INU MINGW64 /a/MuseScore (3-timeline-class)
$ git log
commit c8104f1fdb7038bae7a0526219ee675350e69bee (HEAD -> 3-timeline-class)
Author: Joshua Bonn <jebonn@comcast.net>
Date:   Wed May 31 16:19:02 2017 -0700

    Fix score focus, add coloring, fix docking widget
    selection in the grid moves to the correct location in the score
    add coloring to aid in testing
    allow docking to the bottom of the screen
    fix timeline minimum height

commit 93f7bcabd54868bf245cff72b0c555cbea437d61
Author: Joshua Bonn <jebonn@comcast.net>
Date:   Fri May 19 14:52:24 2017 -0700

    Create timeline class and some functionality

commit a32642f9630bfe35183e784eb1bb169a62e88fee (upstream/master, master)
Author: Eric Fontaine <eric@ericfontainejazz.com>
Date:   Mon May 15 23:01:10 2017 -0400

    fix #201146 allow BUILD_LAME=FALSE

commit 0d09d5545456cd0825a179010a91b6c9a6d06788
Merge: 775c4e5f4 33289292c
Author: Nicolas Froment <lasconic@gmail.com>
Date:   Mon May 29 16:30:01 2017 +0200

    Merge pull request #3171 from Jojo-Schmitz/db-piccolo

    fix #198496: add db piccolo flute

commit 775c4e5f479a05c099ec637ca58c15e576b9660d
Author: Werner Schweer <ws@wschweer.de>
Date:   Mon May 29 16:08:23 2017 +0200

    add missing reference file

commit 131ffccb4a72830f13d8626c3c5a8983a5961029
Author: Werner Schweer <ws@wschweer.de>
Date:   Mon May 29 14:59:10 2017 +0200

    fix import of barline span

commit 5b09a1f1cb20b3bfe72adcb2a777f9e631cd7ab9
Author: Werner Schweer <ws@wschweer.de>
Date:   Fri May 26 14:17:59 2017 +0200

    debug: don't show measure shapes for invisible staves

commit 87a6aaad9eb3f262f08f0b13157989f78d279df5
Author: Werner Schweer <ws@wschweer.de>
Date:   Fri May 26 13:17:15 2017 +0200

    do not allow italic or bold for score font symbols

commit 33289292c82a2378950356b6e2c6712562b6b4ab
Author: Joachim Schmitz <jojo@schmitz-digital.de>
Date:   Sun May 28 17:32:42 2017 +0200

    fix #198496: add db piccolo flute

    and fix typo, from back in 4ed6dec

commit 3d9677840b7a6e8c7d5f0adfd86ae7ec1060e035
Merge: 3d280f21f 701661fb9
Author: Nicolas Froment <lasconic@gmail.com>
Date:   Sat May 27 22:55:53 2017 +0200

    Merge pull request #3186 from ericfont/patch-3

    add libporttime.so to copyLibs for AppImage

commit 701661fb913ac2d73c6160a0d19d625cd51dcdb2
Author: Eric Fontaine <eric@ericfontainejazz.com>
Date:   Sat May 27 16:04:53 2017 -0400

    add libporttime.so to copyLibs for AppImage

    Running AppImage on linux complained about not having "libporttime.so.0"...I forgot to add it to the copyLibs which is needed since I've added PortMidi output.

commit 3d280f21f72191d5775094179cde0e79c8ca8abf
Author: lasconic <lasconic@gmail.com>
Date:   Sat May 27 17:53:08 2017 +0200

    fix #4954 Change staff instrument changes default clef. See PR #3158

commit 04a0219336e336afda95826f7579441aa0da9aa6
Author: lasconic <lasconic@gmail.com>
Date:   Sat May 27 11:40:33 2017 +0200

    Makefile: Add an option to use system's freetype library

commit 8b718d2ec6532dc4f5872e8b8ad64c9994b96f14
Author: lasconic <lasconic@gmail.com>
Date:   Sat May 27 07:52:57 2017 +0200

    Revert "clean up lute instruments"

    This reverts commit b2f25ca51995e67743a269eb6354b570a45282f0.

commit 1357a1c4ba7b24d7fee1046ea381cc76af64ef4d
Merge: 6e401ec9c 4e4693003
Author: Nicolas Froment <lasconic@gmail.com>
Date:   Fri May 26 15:29:55 2017 +0200

    Merge pull request #3170 from ericfont/5163-PortMidiOutput

    fix #5163 Add PortAudio Midi Output

commit 4e4693003e99e63f5b706f44cd40c46b7f3756d3
Author: Eric Fontaine <eric@ericfontainejazz.com>
Date:   Sun May 14 11:43:28 2017 -0400

    fix #5163 Add PortAudio Midi Output

commit 6e401ec9c65eca3ffb79132f798d49f945024b6b
Author: Werner Schweer <ws@wschweer.de>
Date:   Fri May 26 13:09:45 2017 +0200

    text editing: fix handling of score font symbols

commit 332313f34392a8c5d59cf02f447ecb7cc053d94e
Author: Marc Sabatella <marc@outsideshore.com>
Date:   Sun May 7 09:25:44 2017 -0600

    fix #197176: palette double click ignores voice filter

commit 7d851f37eebec5fa3d652735b4530f94b1399d07
Merge: 8d2e6993a ebee6fb8b
Author: Nicolas Froment <lasconic@gmail.com>
Date:   Fri May 26 11:59:35 2017 +0200

    Merge pull request #3168 from Jojo-Schmitz/plugin-manager

    fix #198826 : enable Plugin Manager and Plugin Creator (almost) always

commit 8d2e6993a2c277d1e09725a0d346815be4d5ae63
Merge: 3efdac9ee b2f25ca51
Author: Nicolas Froment <lasconic@gmail.com>
Date:   Fri May 26 11:33:03 2017 +0200

    Merge pull request #3166 from MarkusLutz63/luteinstruments

    Clean up lute instruments in instruments.xml

commit 3efdac9ee1b8da44317f33bc512210a983dcbd6f
Merge: f646c1853 d36501569
Author: Nicolas Froment <lasconic@gmail.com>
Date:   Fri May 26 11:03:35 2017 +0200

    Merge pull request #3161 from Jojo-Schmitz/pre-translation

    Text fixes

commit f646c1853e78a3804c70a710dd24bbd9744254d3
Author: lasconic <lasconic@gmail.com>
Date:   Thu May 25 09:34:26 2017 +0200

    [Travis] fix syntax error in macOS build script

commit e9cea0268a005592c6bd4dfc891535c66915ab7a (origin/master, origin/HEAD)
Merge: 23e9ceee5 eb638118b
Author: Nicolas Froment <lasconic@gmail.com>
Date:   Thu May 25 00:22:18 2017 +0200

    Merge pull request #3169 from Jojo-Schmitz/sentence-case

    fix/improve command line options help texts

commit 23e9ceee5907298db416ca48c7870e9bc6ef14cb
Merge: cd19c84d1 baac9c3fc
Author: Nicolas Froment <lasconic@gmail.com>
Date:   Thu May 25 00:10:51 2017 +0200

    Merge pull request #3173 from ericfont/patch-1

    add comments about purpose of lrelease and lupdate