mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-17 21:48:23 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,049 Commits 9 Branches 61 Tags
bb821d685bc95234eba2b8a57dcebfdf4beff414
Commit Graph

15 Commits

Author SHA1 Message Date
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
Umcaruje
6fb923cba2 Correct the program name and site in the descriptions. 2014-11-04 22:56:50 +01:00
Vesa
b084e91345 Merge branch 'stable-1.1' 
Conflicts:
	data/locale/de.qm
	data/locale/zh.qm
	data/locale/zh.ts
 2014-10-19 14:58:23 +03:00
Vesa
886bf2b16e Revert "Adjust Carla for master branch" 
This reverts commit 30e0140ecb.
 2014-10-18 22:11:47 +03:00
Vesa
95eaa86a6f Revert "Revert "Make carla compile in master"" 
This reverts commit b12e6b773c.
 2014-10-18 22:11:17 +03:00
Vesa
b12e6b773c Revert "Make carla compile in master" 
This reverts commit 633609fdc7.
 2014-10-18 22:07:07 +03:00
Vesa
633609fdc7 Make carla compile in master 2014-10-15 20:43:47 +03:00
Vesa
30e0140ecb Adjust Carla for master branch 2014-10-15 20:36:50 +03:00
falkTX
9fabc0e8b6 Add background artwork for carla 2014-10-10 11:21:23 +01:00
falkTX
9f6c9d96ef Carla: Misc fixing 2014-09-27 00:31:28 +01:00
falkTX
5dddbe7c30 Pass timeInfo to Carla plugin 2014-09-26 11:58:42 +01:00
falkTX
8aa29bb4ba Add TODO items for carla 2014-09-26 10:38:05 +01:00
falkTX
b0fab3d3c2 Carla: Implement UI Save/Open for plugins; Misc fixes 2014-09-26 10:31:08 +01:00
falkTX
b88225ffc8 Carla: Fix link (rpath) and finding binary dir (needs latest carla) 2014-09-16 17:22:23 +01:00
falkTX
849d08c6ef Initial version of Carla plugin for LMMS 2014-09-11 16:54:31 +01:00