summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-04-12 11:58:55 +0200
committerAndreas Maunz <andreas@maunz.de>2011-04-12 11:58:55 +0200
commitbf08b7894c3d21065a81069b4d85d302b7df3d04 (patch)
tree362147f711c52eaf1e6c382a2e6a956aeefc738a
parent7dfb1154463537b4d773febbd5280b16646ebd9d (diff)
parentd4eba4f0c1ff5027bfcc8cd3f7f4c9de3d34ecf6 (diff)
Merge branch 'hotfix-1.0.7'v1.0.7
-rw-r--r--Rakefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Rakefile b/Rakefile
index e60ffc7..4a1f25e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -41,6 +41,7 @@ namespace "fminer" do
task :update do
puts `git submodule update --init`
Dir.chdir('libfminer/libbbrc')
+ puts `git checkout master`
puts `git checkout Makefile`
puts `git pull`
puts `./configure`
@@ -52,6 +53,7 @@ namespace "fminer" do
end
puts `make ruby`
Dir.chdir('../liblast')
+ puts `git checkout master`
puts `git checkout Makefile`
puts `git pull`
puts `./configure`