Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

This commit is contained in:
Andrew 2013-12-13 12:10:40 -06:00
commit 1e96a0c8eb

View File

@ -14,7 +14,7 @@ Getting the project to build and run on Linux is easy if you use Ubuntu 13.10 (o
* Qt 5.1.1+ Development tools (http://qt-project.org/downloads) ("Qt Online Installer for Linux (64 bit)")
* A copy of the MultiMC source (clone it with git)
* cmake
* build-essentials
* build-essential
* zlib (for example, zlib1g-dev)
* java (for example, openjdk-7-jdk)
* GL headers (for example, libgl1-mesa-dev)