aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2002-09-24 22:40:28 +0000
committerMax Horn2002-09-24 22:40:28 +0000
commit77d62a61d7d9a4256a24cc37057f515d123ecfeb (patch)
tree691581e4ffb4d55abb530b7007c72776af450f70
parente946431af32cdbe343ca67d7298a501206bad119 (diff)
downloadscummvm-rg350-77d62a61d7d9a4256a24cc37057f515d123ecfeb.tar.gz
scummvm-rg350-77d62a61d7d9a4256a24cc37057f515d123ecfeb.tar.bz2
scummvm-rg350-77d62a61d7d9a4256a24cc37057f515d123ecfeb.zip
fix for bug #613369; added some files to .cvsignore
svn-id: r5015
-rw-r--r--.cvsignore2
-rw-r--r--Makefile.common1
-rw-r--r--common/system.h2
3 files changed, 4 insertions, 1 deletions
diff --git a/.cvsignore b/.cvsignore
index 3fa5527bec..eb94546cd1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,5 @@
+.DS_Store
+.gdb_history
.deps
build.rules
scummvm
diff --git a/Makefile.common b/Makefile.common
index e70d8ef7e0..7f67006613 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -89,3 +89,4 @@ DEPFILES = $(wildcard $(patsubst %,%/$(DEPDIR)/*.d,$(MODULES)))
distclean: clean
$(RM_REC) $(DEPDIRS)
+ $(RM) build.rules config.h
diff --git a/common/system.h b/common/system.h
index f3fcea129a..4e93350619 100644
--- a/common/system.h
+++ b/common/system.h
@@ -72,7 +72,7 @@ public:
PROP_GET_FULLSCREEN = 7
};
union Property {
- char *caption;
+ const char *caption;
int cd_num;
int gfx_mode;
bool show_cursor;