Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
05eac2db
Commit
05eac2db
authored
Apr 13, 2008
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hmm, removing git remainings. Sorry about this
parent
bbdbad09
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+0
-3
No files found.
extras/contrib/src/Makefile
View file @
05eac2db
...
@@ -2235,7 +2235,6 @@ CLEAN_PKG += clinkcc
...
@@ -2235,7 +2235,6 @@ CLEAN_PKG += clinkcc
DISTCLEAN_PKG
+=
clinkcc
$(CLINKCC_VERSION)
.tar.gz
DISTCLEAN_PKG
+=
clinkcc
$(CLINKCC_VERSION)
.tar.gz
# ***************************************************************************
# ***************************************************************************
<<<<<<< Updated upstream
:
extras/contrib/src/Makefile
# YASM assembler
# YASM assembler
# ***************************************************************************
# ***************************************************************************
...
@@ -2254,8 +2253,6 @@ CLEAN_PKG += yasm
...
@@ -2254,8 +2253,6 @@ CLEAN_PKG += yasm
DISTCLEAN_PKG
+=
yasm-
$(YASM_VERSION)
.tar.bz2
DISTCLEAN_PKG
+=
yasm-
$(YASM_VERSION)
.tar.bz2
# ***************************************************************************
# ***************************************************************************
=======
>>>>>>> Stashed changes
:
extras/contrib/src/Makefile
# Copy aclocal files
# Copy aclocal files
# This is necessary for --missing aclocal to succeed after a
# This is necessary for --missing aclocal to succeed after a
# configure.ac/Makefile.am change in the vlc root dir
# configure.ac/Makefile.am change in the vlc root dir
...
...
Write
Preview
Markdown
is supported
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