Rooba
/
kivy
mirror of https://github.com/kivy/kivy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleaned install-linux from merge - hopefully :/

This commit is contained in:
Thomas-Karl Pietrowski 2013-01-29 21:25:56 +01:00
parent f639d538a0
commit a21a8e9b2f
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/sources/installation/installation-linux.rst
View File

@ -3,18 +3,7 @@
Installation on Linux
=====================
<<<<<<< HEAD
Using software packages
=======
Pre-built Packages
~~~~~~~~~~~~~~~~~~
Look at our `Downloads <http://kivy.org/#download>`_ Section for pre-built packages for various linux distro's
Prerequisites
-------------
Ubuntu (11.10 or newer)
>>>>>>> 2c74d04b0dd963f5a67fb8805cefa97c41709417
~~~~~~~~~~~~~~~~~~~~~~~
Ubuntu
@ -154,13 +143,8 @@ OpenSuse
$ sudo pip install pygments
<<<<<<< HEAD
Mageia (1 and 2(cauldron))
--------------------------
=======
Mageia 1 onwards
~~~~~~~~~~~~~~~~
>>>>>>> 2c74d04b0dd963f5a67fb8805cefa97c41709417
----------------
::