Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Casanowow Life for love
VLC-Android
Commits
3c07f208
Commit
3c07f208
authored
Apr 13, 2012
by
Rafaël Carré
Browse files
Don't silently delete patches
parent
9f3cd727
Changes
1
Hide whitespace changes
Inline
Side-by-side
compile.sh
View file @
3c07f208
...
...
@@ -47,7 +47,11 @@ else
echo
"VLC source found, updating"
cd
vlc
git fetch origin
git checkout
-B
android
${
TESTED_HASH
}
if
git branch
--list
|
grep
-qw
android
;
then
git merge
${
TESTED_HASH
}
else
git checkout
-B
android
${
TESTED_HASH
}
fi
cd
-
fi
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment