Lukas W 23e0e0fb8e Merge branch 'master' into ed_refac ...

Conflicts:
	include/AutomationEditor.h
	include/SongEditor.h
	plugins/delay/delaycontrols.cpp
	plugins/delay/delaycontrolsdialog.cpp
	src/gui/editors/AutomationEditor.cpp
	src/gui/editors/BBEditor.cpp
	src/gui/editors/PianoRoll.cpp

2015-01-06 23:05:13 +01:00

..

backgrounds

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

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

locale

Merge commit 'f7741f184f83e6b9e2f081d39efffb2c499962f6' into ed_refac

2015-01-06 16:11:39 +01:00

presets

Merge pull request #1433 from Sti2nd/stable-1.1

2014-12-16 10:48:42 -05:00

projects

Fix old sourceforge links, update Readme

2014-11-23 19:55:34 +01:00

samples

use trimmed metronome sound of @mikobuntu

2014-11-01 12:56:18 +01:00

scripts

better naming consistency with windows builds

2014-12-17 12:59:36 -05:00

themes

ToolBar css fixes

2014-12-08 17:12:38 +01: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

New DMG background

2014-10-30 17:02:01 -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

static engine, chunked audio buffer, pat fix, MIME type

2007-04-19 06:52:29 +00:00

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