summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2011-04-12 11:59:19 +0200
committerAndreas Maunz <andreas@maunz.de>2011-04-12 11:59:19 +0200
commitb4ad8ba61cea2f7603b107bd02aaeb2d3c913557 (patch)
tree44caf18616b81b4e0833c7cc974eb45593603c05
parente75d5b5d682e954fcbc8134802c7c868bab730a9 (diff)
parentd4eba4f0c1ff5027bfcc8cd3f7f4c9de3d34ecf6 (diff)
Merge branch 'hotfix-1.0.7' into development
-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`