summaryrefslogtreecommitdiffstats
path: root/vrplayer/decoderthread.cpp
diff options
context:
space:
mode:
authorspeidy <speidy@gmail.com>2016-12-22 12:04:29 -0500
committerspeidy <speidy@gmail.com>2016-12-22 12:04:29 -0500
commit93c55e58a884270850794c29bd0f4e2df22e22d6 (patch)
tree0eeece185f648a2ddf14d522c54c75c70986afda /vrplayer/decoderthread.cpp
parentf4224615c97668236826d115fa37b6ce805bea96 (diff)
parent38253f1371b5e01e05ba995f28b6451ee57b613c (diff)
downloadxrdp-proprietary-93c55e58a884270850794c29bd0f4e2df22e22d6.tar.gz
xrdp-proprietary-93c55e58a884270850794c29bd0f4e2df22e22d6.zip
Merge branch 'devel' of https://github.com/neutrinolabs/xrdp
Conflicts: xorgxrdp
Diffstat (limited to 'vrplayer/decoderthread.cpp')
-rw-r--r--vrplayer/decoderthread.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/vrplayer/decoderthread.cpp b/vrplayer/decoderthread.cpp
index 36ba4c85..7841a3b5 100644
--- a/vrplayer/decoderthread.cpp
+++ b/vrplayer/decoderthread.cpp
@@ -23,7 +23,7 @@
/*
* TODO:
* o need to maintain aspect ratio while resizing
- * o clicking in the middle of the slider bar shuld move the slider to the middle
+ * o clicking in the middle of the slider bar should move the slider to the middle
* o need to be able to rewind the move when it is done playing
* o need to be able to load another move and play it w/o restarting player
* o pause button needs to work