Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

[dcpomatic.git] / TO_PORT

diff --git a/TO_PORT b/TO_PORT
index 83ea9c7b5b856f567485d639c471fb969fa670f2..6cf16c46443dc98afe4ae89c204abc4eaa423935 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,6 +1,5 @@
-ec3e6abf817b84d589f0782b01f5059dd3bf0953
-f4673814cfa26884d113f93f347d97868e9e585a
-24ae3a8f0a68529b50c34079e643caf6b9327523
-83f1ea8eacb4d56860ccdb9db5acdf12c6e71dfb
-c0e0b90d987af2586323d4a67bd67330256da51d
-69866d9ba972d21375081c313ac245535ac55be9
+2a595178e42734336983693e8150609554b6a08d
+4bcdf16458e460dd4a78d634dfe69f2a44182541
+21f33acd3580c6e5c4ec1e7449b419c3178aa8ab
+Multi-stream audio stuff.
+681d95c83868310330984ae65589a1021bbe07d6