Merge branch 'v0.04'

Conflicts:
	scripts/install_precise.sh
This commit is contained in:
Santi Noreña 2013-05-07 14:32:57 +02:00
commit c91b183a81
10 changed files with 101 additions and 190 deletions

View file

@ -18,7 +18,7 @@ if [ "$output" -eq "0" ]; then
echo "deb http://apt.openlighting.org/ubuntu precise main" >> /etc/apt/sources.list
fi
apt-get update
apt-get -y --force-yes install ola libqtcore4 libqtgui4 libmagick++4 libav-tools
apt-get -y --force-yes install ola libqtcore4 libqtgui4 libmagick++4 libav-tools libftgl2 libavifile-0.7c2 libgmerlin-avdec1 libmpeg3-1
if [ "$?" -eq "0" ]; then
echo "apt-get finish ok"
else echo "apt-get return errors!"