diff options
author | Paul Gilbert | 2014-03-01 17:28:24 -0500 |
---|---|---|
committer | Paul Gilbert | 2014-03-01 17:28:24 -0500 |
commit | 7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e (patch) | |
tree | 96de4f3470bd9bcc81bbae82a3e1c59f523a8edf /backends/keymapper/action.h | |
parent | badb8d97444767b7d8fea0f877ac044249696a5f (diff) | |
parent | 2218d14fb5276724c757406d5ac1ec581160721b (diff) | |
download | scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.tar.gz scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.tar.bz2 scummvm-rg350-7880ae0b18c3e2a25ed1c4a2bc42e22066d1ff3e.zip |
Merge branch 'master' into mads
Diffstat (limited to 'backends/keymapper/action.h')
-rw-r--r-- | backends/keymapper/action.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/backends/keymapper/action.h b/backends/keymapper/action.h index 5e69ed3918..ed4bb86ce6 100644 --- a/backends/keymapper/action.h +++ b/backends/keymapper/action.h @@ -1,24 +1,24 @@ /* ScummVM - Graphic Adventure Engine -* -* ScummVM is the legal property of its developers, whose names -* are too numerous to list here. Please refer to the COPYRIGHT -* file distributed with this source distribution. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* 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. -* -*/ + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * 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 COMMON_ACTION_H #define COMMON_ACTION_H |