]> git.sesse.net Git - casparcg/commit
Manually merged d9e90d7048a3598924f929540702fbf950524af0 from master
authorHelge Norberg <helge.norberg@svt.se>
Tue, 9 Apr 2013 09:09:45 +0000 (11:09 +0200)
committerHelge Norberg <helge.norberg@svt.se>
Tue, 9 Apr 2013 09:09:45 +0000 (11:09 +0200)
commit479d8b9aba0c4fdebf23171736dd2b098043b9e6
tree1122c37f0614ec72e167dec3bf73a846c6f40d5e
parentf4694df7fab59d830afecb4be598e24d7068f367
Manually merged d9e90d7048a3598924f929540702fbf950524af0 from master
common/future.h