Michael Niedermayer 660229d647 Revert "Bump minor versions after 3.2 branchpoint to seperate release" ...

this should only have been on master

This reverts commit 1609935b6cbe3fb77f27257cabefbee3f7118dc3.

2016-10-26 21:22:12 +02:00

..

aarch64

Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'

2016-05-09 16:25:28 +01:00

arm

Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'

2016-05-09 16:25:28 +01:00

tests

Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'

2016-06-22 13:44:34 +02:00

x86

…

audio_convert.c

…

audio_convert.h

…

audio_data.c

…

audio_data.h

…

audio_mix_matrix.c

…

audio_mix.c

…

audio_mix.h

…

avresample.h

doxygen: Standardize root-level modules

2016-08-02 22:15:25 -07:00

avresampleres.rc

…

dither.c

…

dither.h

Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'

2016-06-21 21:55:34 +02:00

internal.h

…

libavresample.v

build: Change structure of the linker version script templates

2016-05-29 16:43:11 +02:00

Makefile

…

options.c

…

resample_template.c

…

resample.c

Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'

2016-06-21 21:55:34 +02:00

resample.h

…

utils.c

…

version.h

Revert "Bump minor versions after 3.2 branchpoint to seperate release"

2016-10-26 21:22:12 +02:00