Merge remote-tracking branch 'origin/unstable' into unstable

This commit is contained in:
Aloshi 2013-06-16 16:24:17 -05:00
commit 19eb1c412f

View file

@ -10,7 +10,7 @@
#include <memory>
#include "../Sound.h"
#define MARQUEE_DELAY 600
#define MARQUEE_DELAY 900
#define MARQUEE_SPEED 16
#define MARQUEE_RATE 3
@ -315,6 +315,8 @@ void TextListComponent<T>::clear()
{
mRowVector.clear();
mSelection = 0;
mMarqueeOffset = 0;
mMarqueeTime = -MARQUEE_DELAY;
}
template <typename T>