Merge pull request #331 from sev-/gsoc2012-eventsrecorder

GSoC2012: Event Recorder (reworked)
This commit is contained in:
Eugene Sandulenko 2013-07-04 04:58:54 -07:00
commit 49210a803a
98 changed files with 5349 additions and 1918 deletions

View file

@ -450,7 +450,7 @@ bool OSystem_Android::getFeatureState(Feature f) {
}
}
uint32 OSystem_Android::getMillis() {
uint32 OSystem_Android::getMillis(bool skipRecord) {
timeval curTime;
gettimeofday(&curTime, 0);