Lukas W
1059c92d87
Merge branch 'stable-1.2'
# Conflicts:
# .travis/linux..before_install.sh
# .travis/linux..install.sh
# cmake/linux/lmms.desktop
# plugins/vst_base/CMakeLists.txt
2017-10-18 17:33:55 +02:00
..
2017-04-16 00:46:47 +02:00
2017-03-26 22:45:41 +02:00
2017-04-16 00:46:47 +02:00
2017-10-18 17:33:55 +02:00
2017-10-18 17:33:55 +02:00
2017-10-18 17:33:55 +02:00
2017-04-16 00:46:47 +02:00
2017-07-15 08:08:07 +09:00
2017-04-16 00:46:47 +02:00
2017-04-16 00:46:47 +02:00
2017-07-15 08:08:07 +09:00
2017-04-16 00:46:47 +02:00
2017-04-16 00:46:47 +02:00
2017-04-16 00:46:47 +02:00
2017-10-14 13:41:17 -04:00
2017-05-02 00:38:49 +02:00
2017-07-04 11:12:21 +02:00