diff options
| author | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
| commit | aa49b38c5a8032586cb94fc4ca07149eecabe64a (patch) | |
| tree | ea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /backends/platform/webos | |
| parent | d3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff) | |
| parent | c86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff) | |
| download | scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2 scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
Diffstat (limited to 'backends/platform/webos')
| -rw-r--r-- | backends/platform/webos/main.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/webos/webos.cpp | 3 | ||||
| -rw-r--r-- | backends/platform/webos/webos.h | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/backends/platform/webos/main.cpp b/backends/platform/webos/main.cpp index eefdd30496..43c7ba18af 100644 --- a/backends/platform/webos/main.cpp +++ b/backends/platform/webos/main.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #define FORBIDDEN_SYMBOL_EXCEPTION_unistd_h diff --git a/backends/platform/webos/webos.cpp b/backends/platform/webos/webos.cpp index 7db17f4b9f..bfb19ed3bc 100644 --- a/backends/platform/webos/webos.cpp +++ b/backends/platform/webos/webos.cpp @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #include "backends/platform/webos/webos.h" diff --git a/backends/platform/webos/webos.h b/backends/platform/webos/webos.h index 1cdba703e0..850aaf9ce2 100644 --- a/backends/platform/webos/webos.h +++ b/backends/platform/webos/webos.h @@ -18,9 +18,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL$ - * $Id$ - * */ #ifndef PLATFORM_SDL_WEBOS_H |