Lukas W 8e8879f735 Merge stable-1.1 ...

Conflicts:
	include/ConfigManager.h
	include/MidiTime.h
	include/string_pair_drag.h
	src/gui/string_pair_drag.cpp
	src/gui/widgets/rubberband.cpp

2014-11-10 19:26:59 +01:00

..

3off.png

SID artwork

2014-02-21 03:03:08 +02:00

3offred.png

SID artwork

2014-02-21 03:03:08 +02:00

6581.png

SID artwork

2014-02-21 03:03:08 +02:00

6581red.png

SID artwork

2014-02-21 03:03:08 +02:00

8580.png

SID artwork

2014-02-21 03:03:08 +02:00

8580red.png

SID artwork

2014-02-21 03:03:08 +02:00

artwork.png

SID artwork

2014-02-21 03:03:08 +02:00

bp.png

SID artwork

2014-02-21 03:03:08 +02:00

bpred.png

SID artwork

2014-02-21 03:03:08 +02:00

CMakeLists.txt

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

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

envelope.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

envelope.h

renamed class SID to cSID for not conflicting with data structure SID in win32 headers

2008-09-20 12:31:17 +00:00

extfilt.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

extfilt.h

renamed class SID to cSID for not conflicting with data structure SID in win32 headers

2008-09-20 12:31:17 +00:00

filter.cc

fixed compiler warnings

2008-09-24 09:33:01 +00:00

filter.h

renamed class SID to cSID for not conflicting with data structure SID in win32 headers

2008-09-20 12:31:17 +00:00

filter.png

SID artwork

2014-02-21 03:03:08 +02:00

filterred.png

SID artwork

2014-02-21 03:03:08 +02:00

hp.png

SID artwork

2014-02-21 03:03:08 +02:00

hpred.png

SID artwork

2014-02-21 03:03:08 +02:00

logo.png

SID: improved artwork+logo once more

2010-09-02 00:07:07 +02:00

lp.png

SID artwork

2014-02-21 03:03:08 +02:00

lpred.png

SID artwork

2014-02-21 03:03:08 +02:00

noise.png

SID artwork

2014-02-21 03:03:08 +02:00

noisered.png

SID artwork

2014-02-21 03:03:08 +02:00

pot.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

pot.h

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

pulse.png

SID artwork

2014-02-21 03:03:08 +02:00

pulsered.png

SID artwork

2014-02-21 03:03:08 +02:00

ring.png

SID artwork

2014-02-21 03:03:08 +02:00

ringred.png

SID artwork

2014-02-21 03:03:08 +02:00

saw.png

SID artwork

2014-02-21 03:03:08 +02:00

sawred.png

SID artwork

2014-02-21 03:03:08 +02:00

sid_instrument.cpp

Merge stable-1.1

2014-11-10 19:26:59 +01:00

sid_instrument.h

Merge stable-1.1

2014-11-10 19:26:59 +01:00

sid.cc

fixed compiler warnings

2008-09-24 09:33:01 +00:00

sid.h

fixed compiler warnings

2008-09-24 09:33:01 +00:00

siddefs.h

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

spline.h

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

sync.png

SID artwork

2014-02-21 03:03:08 +02:00

syncred.png

SID artwork

2014-02-21 03:03:08 +02:00

test.png

SID artwork

2014-02-21 03:03:08 +02:00

testred.png

SID artwork

2014-02-21 03:03:08 +02:00

triangle.png

SID artwork

2014-02-21 03:03:08 +02:00

trianglered.png

SID artwork

2014-02-21 03:03:08 +02:00

version.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

voice.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

voice.h

renamed class SID to cSID for not conflicting with data structure SID in win32 headers

2008-09-20 12:31:17 +00:00

wave6581__ST.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

wave6581_P_T.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

wave6581_PS_.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

wave6581_PST.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

wave8580__ST.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

wave8580_P_T.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

wave8580_PS_.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

wave8580_PST.cc

added SID instrument plugin by Attila Herman and Csaba Hruska

2008-08-06 09:56:06 +00:00

wave.cc

fixed compiler warnings

2008-09-24 09:33:01 +00:00

wave.h

renamed class SID to cSID for not conflicting with data structure SID in win32 headers

2008-09-20 12:31:17 +00:00