Hyunjin Song 4252f755c2 Merge branch 'stable-1.2' ...

# Conflicts:
#	cmake/nsis/CMakeLists.txt
#	src/core/ProjectRenderer.cpp
#	src/tracks/Pattern.cpp

2018-10-29 16:20:58 +09:00

..

CMakeLists.txt

Update the LMMS logo and mimetypes (#4519)

2018-09-24 11:09:49 +02:00

dmg_branding.png

Initial Homebrew on OSX Lion patch

2015-08-17 12:39:41 -04:00

icon.icns

Update the LMMS logo and mimetypes (#4519)

2018-09-24 11:09:49 +02:00

install_apple.sh.in

Merge branch 'stable-1.2'

2018-09-18 09:54:38 +09:00

lmms.plist.in

Enable HiDPI Scaling (Qt 5.6+ only) [stable-1.2] (#3814)

2017-09-20 10:12:41 -07:00

package_apple.json.in

Remove mounted icon

2016-10-10 11:29:45 -04:00

project.icns

Update the LMMS logo and mimetypes (#4519)

2018-09-24 11:09:49 +02:00