summaryrefslogtreecommitdiffstats
path: root/INSTALL
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-05-21 13:45:25 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-05-21 13:45:25 -0700
commit00b1469658fc43ec6448cd01e59405bfeeef40cb (patch)
treeecb8fa67098432c49e82c1fd0dcf76f32c3d4b82 /INSTALL
parent9ca033c55038efed82b8a09dcd84e310a58f2e73 (diff)
parent707a1f7af71b441f333bcf45fd980a176542aab3 (diff)
downloadsubsurface-00b1469658fc43ec6448cd01e59405bfeeef40cb.tar.gz
Merge branch 'v4.4-branch' into newmaster
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'INSTALL')
-rw-r--r--INSTALL10
1 files changed, 5 insertions, 5 deletions
diff --git a/INSTALL b/INSTALL
index 43bd17e6e..2a4c987f8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -92,7 +92,7 @@ like this:
mkdir -p ~/src
cd ~/src
-git clone -b v4.4.1 git://subsurface-divelog.org/subsurface
+git clone -b v4.4.2 git://subsurface-divelog.org/subsurface
./subsurface/scripts/build.sh # <- this step will take quite a while as it
# compiles a handful of libraries before
# building Subsurface
@@ -271,10 +271,10 @@ To compile Subsurface, use:
$ cd ~/src
$ git clone git://subsurface-divelog.org/subsurface.git
$ cd subsurface
-$ git checkout v4.4-branch # this get's you the last release
- # skip this step to build the latest development
- # version
-$ packaging/windows/mingw-make.sh Qt5-64
+$ cd git checkout v4.4.2 # this get's you the last release
+ # skip this step to build the latest development
+ # version
+$ packagin/windows/mingw-make.sh Qt5 SPECIAL_MARBLE_PREFIX=1
$ packaging/windows/mingw-make.sh install
$ packaging/windows/mingw-make.sh installer