Skip to content
Snippets Groups Projects
Commit 4e2e8cb7 authored by Guillaume Roguez's avatar Guillaume Roguez
Browse files

Merge fixes from branch 'release-2.0.x'

* release-2.0.x:
  contrib: bump opendht
  opendht: fix windows and android build
  contrib/upnp: rename uuid_create to avoid conflict
  media: use rational class to carry framerate
  utils: add rational class

Change-Id: Ia2d25b2def85318968f881311d483cd785b0258f
parents f9050d9e e0e15794
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment