Tobias Doerffel f2876ea650 Merge remote-tracking branch 'origin/stable-1.1' ...

Conflicts:
	data/locale/zh.ts
	src/tracks/Pattern.cpp

2014-09-30 22:53:24 +02:00

..

backgrounds

Bug #175: Completed quoting for parameters of some CMake commands

2014-02-01 15:20:27 +01:00

locale

Merge remote-tracking branch 'origin/stable-1.1'

2014-09-30 22:53:24 +02:00

presets

Added some presets for Monstro, Bitinvader, Watsyn and Kicker.

2014-09-08 00:14:02 +02:00

projects

Added Popsip-Electric Dancer to CoolSongs

2014-09-14 21:09:45 +02:00

samples

Added custom waveforms to sample directory

2014-02-01 00:01:42 +02:00

scripts

Revert changes

2014-05-12 22:10:28 -07:00

themes

Renamed pattern/patternView to Pattern/PatternView

2014-09-30 22:49:16 +02:00

wavetables

BandLimitedWave: provide wavetables as pre-generated "bin" files, these will be installed under datadir/wavetables

2014-04-25 19:17:41 +03:00

application-x-lmms-project.svg

Adding MIME-type icon to the data directory for packagers to use

2014-02-05 05:35:56 +02:00

CMakeLists.txt

Merge remote-tracking branch 'origin/stable-1.0'

2014-05-12 21:57:10 +02:00

dmg_branding.png

Added Apple specific artwork

2014-04-01 13:03:35 -04:00

lmms

Change Linux Multimedia etc. to LMMS in desktop/package files

2014-03-19 03:26:36 +02:00

lmms.desktop

Desktop file modification to correct ubuntu behavior, icon file copied to data/ as lmms.png because it's needed for packaging

2014-03-20 16:44:35 +02:00

lmms.icns

Added Apple specific artwork

2014-04-01 13:03:35 -04:00

lmms.ico

Updated LMMS icon

2014-02-17 21:44:44 +02:00

lmms.plist.in

Update lmms.plist.in

2014-05-07 19:06:40 -07:00

lmms.png

Desktop file modification to correct ubuntu behavior, icon file copied to data/ as lmms.png because it's needed for packaging

2014-03-20 16:44:35 +02:00

lmms.xml

…

nsis_branding.bmp

nsis_branding.bmp, 256 color version to fix #831

2014-06-12 02:17:03 -04:00

project.icns

Mimetype icon, Apple formatted

2014-05-01 22:44:25 -04:00