Skip to content

GitLab

Commit 05eac2db authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

hmm, removing git remainings. Sorry about this

parent bbdbad09
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
extras/contrib/src/Makefile
View file @ 05eac2db
......@@ -2235,7 +2235,6 @@ CLEAN_PKG += clinkcc
DISTCLEAN_PKG += clinkcc$(CLINKCC_VERSION).tar.gz
# ***************************************************************************
<<<<<<< Updated upstream:extras/contrib/src/Makefile
# YASM assembler
# ***************************************************************************
......@@ -2254,8 +2253,6 @@ CLEAN_PKG += yasm
DISTCLEAN_PKG += yasm-$(YASM_VERSION).tar.bz2
# ***************************************************************************
=======
>>>>>>> Stashed changes:extras/contrib/src/Makefile
# Copy aclocal files
# This is necessary for --missing aclocal to succeed after a
# configure.ac/Makefile.am change in the vlc root dir
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment