diff options
author | Darrell Anderson <[email protected]> | 2012-06-08 16:49:55 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2012-06-08 16:49:55 -0500 |
commit | b603721acb76d44bfe91fa212a00174a5f774d96 (patch) | |
tree | 0100b1df14504d33103cefdfc442c50e45b5d2ec | |
parent | 6857c42c073b3a933819ecda94067845a26b3d19 (diff) | |
parent | 6aff075a49b274eaa2dfa9360d9a41a38fe803bf (diff) | |
download | kmplayer-b603721acb76d44bfe91fa212a00174a5f774d96.tar.gz kmplayer-b603721acb76d44bfe91fa212a00174a5f774d96.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kmplayer
m--------- | admin | 0 | ||||
m--------- | cmake | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/admin b/admin -Subproject 4af57bf22967e6ad80ab898980ed505df6eae5b +Subproject 06098efaf31973c11d7dd89ae291e6844b132e1 diff --git a/cmake b/cmake -Subproject d2f658ca47faefe569bcd1885b9238691fa1328 +Subproject e47cc63e66a12ca6b740500b76f385336ee40db |