commit | 8d37a263048e9bc2fe5109966ee3442378f363c6 | [log] [download] |
---|---|---|
author | unknown <Attila@EEEPC1215B.(none)> | Sun Jun 10 09:44:32 2012 +0200 |
committer | unknown <Attila@EEEPC1215B.(none)> | Sun Jun 10 09:44:32 2012 +0200 |
tree | 572ab58205bca747e3f12e0377a233e8cb80be07 | |
parent | f2c2d1bfd46471fd58b6d1512739577fc9ff0347 [diff] | |
parent | 7ef9184f24ae2e565c038628e8273e3dccc5414a [diff] |
Merge branch 'master' of https://git01.codeplex.com/tedplay Conflicts: win/PlayList.cpp