Merge commit '11f3d5c69b711a1f1631961921ecd20d31f8336d'

Browse Source

* commit '11f3d5c69b711a1f1631961921ecd20d31f8336d':
  hap: Name enums, remove unused struct member

Conflicts:
	libavcodec/hap.h

See: 440c26e9c46bb26bc1fc8306561ed6962ae7d3bf
See: d8488090e5070187e9d8d0a93b8d841f26bde990
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

...

This commit is contained in:

Michael Niedermayer 2015-07-23 18:01:49 +02:00

parent efa1e26122 11f3d5c69b

commit cb59d29fd6

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available