Merge branch 'master' into win2
commitb304d0ce96c9de536c389a3695c9c8db2aff444d
authorJean-loup Gailly <jloup@gailly.net>
Mon, 8 Aug 2011 12:35:29 +0000 (8 14:35 +0200)
committerJean-loup Gailly <jloup@gailly.net>
Mon, 8 Aug 2011 12:35:29 +0000 (8 14:35 +0200)
tree85648509fe362f4b0c483051388b7652c2e979b0
parent3817dfd029170898764011fce067947484730f5d
parenta2e1cfc9c10e27700ee930ec922fe441ae32aa91
Merge branch 'master' into win2
uct/policy/ucb1amaf.c