Merge branch '1.0' into 1.0-seek
authorCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 16:32:44 +0000 (16:32 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 18 Dec 2013 16:32:44 +0000 (16:32 +0000)
commitad10aea1d685e67e0e639f6303fc9c8f8f1f945c
treec6864f2bc1e62e74f9c7324a3d6bdda30ac5a076
parentc226f90a2c113b8bbc270f29e6aa035ae1229d57
parentd0cbdd2d2da7aaa5454e47bf7dcad27bf90bd361
Merge branch '1.0' into 1.0-seek
src/lib/player.cc
src/wx/video_panel.cc