From: Felix Paul Kühne Date: Sun, 13 Apr 2008 18:16:43 +0000 (+0200) Subject: hmm, removing git remainings. Sorry about this X-Git-Tag: 0.9.0-test0~1485^2~7 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=05eac2dbdf9f3a3231dc2eefda62202837fdeec6;p=vlc hmm, removing git remainings. Sorry about this --- diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 6d1d7b693a..be7d3646f6 100644 --- a/extras/contrib/src/Makefile +++ b/extras/contrib/src/Makefile @@ -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