mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-02-04 19:53:27 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,155 Commits 10 Branches 61 Tags
9fe55161a83defb76d33ea751a03103362fbb607
Commit Graph

4 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
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
Tobias Doerffel
de45718351 Renamed pattern/patternView to Pattern/PatternView 2014-09-30 22:49:16 +02:00