Message ID | 20160818164534.GJ5460@nb4 |
---|---|
State | Accepted |
Headers | show |
--- murge.ours 2016-08-18 18:37:05.988944547 +0200 +++ murge.theirs 2016-08-18 18:37:05.984944545 +0200 @@ -1,2 +1,2 @@ -#define LIBAVFILTER_VERSION_MINOR 52 +#define LIBAVFILTER_VERSION_MINOR 47 #define LIBAVFILTER_VERSION_MICRO 100 --- murge.common 2016-08-18 18:37:05.988944547 +0200 +++ murge.theirs 2016-08-18 18:37:05.984944545 +0200 @@ -1,2 +1,2 @@ -#define LIBAVFILTER_VERSION_MINOR 46 -#define LIBAVFILTER_VERSION_MICRO 102 +#define LIBAVFILTER_VERSION_MINOR 47 +#define LIBAVFILTER_VERSION_MICRO 100 --- murge.common 2016-08-18 18:37:05.988944547 +0200 +++ murge.ours 2016-08-18 18:37:05.988944547 +0200 @@ -1,2 +1,2 @@ -#define LIBAVFILTER_VERSION_MINOR 46 -#define LIBAVFILTER_VERSION_MICRO 102 +#define LIBAVFILTER_VERSION_MINOR 52 +#define LIBAVFILTER_VERSION_MICRO 100