Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

FFmpeg
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

1eda312a

Commit 1eda312a authored 10 years ago by Michael Niedermayer

Downloads
- Plain Diff

Merge commit '47e3e109'


* commit '47e3e109':
  cmdutils: Use the correct guard

Conflicts:
	cmdutils.c

See: 35daf3ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>

parents 7dba57d1 47e3e109

No related branches found

No related tags found

Loading

Changes 1

Hide whitespace changes

Inline Side-by-side

Showing

cmdutils.c 1 addition, 1 deletion

cmdutils.c

with 1 addition and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment