mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-03-14 12:08:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge stable-1.1

Browse Source 
Conflicts:
	include/ConfigManager.h
	include/MidiTime.h
	include/string_pair_drag.h
	src/gui/string_pair_drag.cpp
	src/gui/widgets/rubberband.cpp
This commit is contained in:
Lukas W
2014-11-10 19:26:59 +01:00
parent 2c7036edd6 102db9cd50
commit 8e8879f735
495 changed files with 518 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/SerializingObject.cpp
View File

@@ -3,7 +3,7 @@
*
* Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
*
* This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
* This file is part of LMMS - http://lmms.io
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public