Merge remote-tracking branch 'origin/stable-1.1'

Conflicts:
	README.md
This commit is contained in:
Tobias Doerffel
2014-09-28 18:11:54 +02:00
18 changed files with 789 additions and 2 deletions

View File

@@ -1,5 +1,4 @@
![LMMS Logo](http://lmms.sourceforge.net/Lmms_logo.png) Linux MultiMedia Studio (LMMS)
=======================
![LMMS Logo](http://lmms.sourceforge.net/Lmms_logo.png) LMMS
[![Build Status](https://travis-ci.org/LMMS/lmms.png)](https://travis-ci.org/LMMS/lmms)
What is LMMS?