Merge remote-tracking branch 'origin/master'

This commit is contained in:
Gina Häußge 2013-01-27 11:14:50 +01:00
commit 05c5a679f2

View file

@ -135,7 +135,7 @@ You should then be able to start the OctoPrint server:
If you also want webcam and timelapse support, you'll need to download and compile MJPG-Streamer:
cd ~
sudo apt-get install libjpeg8-dev imagemagick libav-tools
sudo apt-get install subversion libjpeg8-dev imagemagick libav-tools
wget -Omjpg-streamer.tar.gz http://mjpg-streamer.svn.sourceforge.net/viewvc/mjpg-streamer/mjpg-streamer/?view=tar
tar xfz mjpg-streamer.tar.gz
cd mjpg-streamer
@ -195,4 +195,4 @@ I also want to thank [Janina Himmen](http://jhimmen.de/) for providing the kick-
Why is it called OctoPrint and what's with the crystal ball in the logo?
------------------------------------------------------------------------
It so happens that I needed a favicon and also OctoPrint's first name -- Printer WebUI -- simply lacked a certain coolness to it. So I asked The Internet(tm) for advise. After some brainstorming, the idea of a cute Octopus watching his print job remotely through a crystal ball was born... [or something like that](https://plus.google.com/u/0/106003970953341660077/posts/UmLD5mW8yBQ).
It so happens that I needed a favicon and also OctoPrint's first name -- Printer WebUI -- simply lacked a certain coolness to it. So I asked The Internet(tm) for advise. After some brainstorming, the idea of a cute Octopus watching his print job remotely through a crystal ball was born... [or something like that](https://plus.google.com/u/0/106003970953341660077/posts/UmLD5mW8yBQ).