Merge branch 'develop' into qt5.4

This commit is contained in:
obscuren 2015-01-29 12:02:45 +01:00
commit d0c6559204

View File

@ -13,9 +13,9 @@ RUN apt-get update && apt-get upgrade -y
RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev RUN apt-get install -y git mercurial build-essential software-properties-common pkg-config libgmp3-dev libreadline6-dev libpcre3-dev libpcre++-dev
## Build and install Go ## Build and install Go
RUN git clone https://go.googlesource.com/go RUN git clone https://go.googlesource.com/go golang
RUN cd go && git checkout go1.4.1 RUN cd golang && git checkout go1.4.1
RUN cd go/src && ./all.bash && go version RUN cd golang/src && ./all.bash && go version
## Install GUI dependencies ## Install GUI dependencies
RUN add-apt-repository ppa:ubuntu-sdk-team/ppa -y RUN add-apt-repository ppa:ubuntu-sdk-team/ppa -y