hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'stable-1.2'

Browse Source 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	src/core/Track.cpp
This commit is contained in:
Hyunjin Song
2020-07-05 11:27:33 +09:00
parent 84998a26fd 94363be152
commit c83c9bf54f
7 changed files with 61 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/script.sh
View File

@@ -13,7 +13,7 @@ if [ "$TYPE" = 'style' ]; then
else
export CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo"
export CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUNDLE_QT_TRANSLATIONS=ON"
if [ -z "$TRAVIS_TAG" ]; then
export CMAKE_FLAGS="$CMAKE_FLAGS -DUSE_CCACHE=ON"