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 /devtools/create_drascula | |
| 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 'devtools/create_drascula')
| -rw-r--r-- | devtools/create_drascula/create_drascula.cpp | 3 | ||||
| -rw-r--r-- | devtools/create_drascula/create_drascula.h | 3 | ||||
| -rw-r--r-- | devtools/create_drascula/module.mk | 2 | ||||
| -rw-r--r-- | devtools/create_drascula/staticdata.h | 3 |
4 files changed, 0 insertions, 11 deletions
diff --git a/devtools/create_drascula/create_drascula.cpp b/devtools/create_drascula/create_drascula.cpp index 9ea2da380a..20b60ab05f 100644 --- a/devtools/create_drascula/create_drascula.cpp +++ b/devtools/create_drascula/create_drascula.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$ - * * This is a utility for storing all the hardcoded data of Drascula in a separate * data file, used by the game engine */ diff --git a/devtools/create_drascula/create_drascula.h b/devtools/create_drascula/create_drascula.h index 13903e9564..754050c172 100644 --- a/devtools/create_drascula/create_drascula.h +++ b/devtools/create_drascula/create_drascula.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 CREATE_DRASCULA_H diff --git a/devtools/create_drascula/module.mk b/devtools/create_drascula/module.mk index b5a32d8d00..bbc2f7bce0 100644 --- a/devtools/create_drascula/module.mk +++ b/devtools/create_drascula/module.mk @@ -1,5 +1,3 @@ -# $URL$ -# $Id$ MODULE := devtools/create_drascula diff --git a/devtools/create_drascula/staticdata.h b/devtools/create_drascula/staticdata.h index f45af487b1..21b9a82622 100644 --- a/devtools/create_drascula/staticdata.h +++ b/devtools/create_drascula/staticdata.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 STATICDATA_H |