aboutsummaryrefslogtreecommitdiff
path: root/backends/timer/default
diff options
context:
space:
mode:
authorKamil Zbrog2014-03-29 22:13:07 +0100
committerKamil Zbrog2014-03-29 22:13:07 +0100
commit5ffa58dba7a941249af9ca8c1bd229c310fb296b (patch)
tree49faae8eb3424c32d890b4d3cd1eefeb11fc3cd9 /backends/timer/default
parent8eac80cfc59c34299899ebe18a3b0582ef76e0d2 (diff)
parent620411bfebe72fb0f60c4d8f64558be088cff58d (diff)
downloadscummvm-rg350-5ffa58dba7a941249af9ca8c1bd229c310fb296b.tar.gz
scummvm-rg350-5ffa58dba7a941249af9ca8c1bd229c310fb296b.tar.bz2
scummvm-rg350-5ffa58dba7a941249af9ca8c1bd229c310fb296b.zip
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'backends/timer/default')
-rw-r--r--backends/timer/default/default-timer.cpp1
-rw-r--r--backends/timer/default/default-timer.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp
index ce93320f3d..8964d5a7c7 100644
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
*/
#include "common/scummsys.h"
diff --git a/backends/timer/default/default-timer.h b/backends/timer/default/default-timer.h
index 5884979da0..8b23fb744f 100644
--- a/backends/timer/default/default-timer.h
+++ b/backends/timer/default/default-timer.h
@@ -17,6 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
*/
#ifndef BACKENDS_TIMER_DEFAULT_H