summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdk/.cvsignore2
-rw-r--r--glib/.cvsignore2
-rw-r--r--glib/ChangeLog5
-rw-r--r--glib/gmem.c4
-rw-r--r--gtk/.cvsignore3
5 files changed, 11 insertions, 5 deletions
diff --git a/gdk/.cvsignore b/gdk/.cvsignore
index bf7462512e..5fc22a64bd 100644
--- a/gdk/.cvsignore
+++ b/gdk/.cvsignore
@@ -4,6 +4,6 @@ Makefile.in
.deps
_libs
.libs
-libgdk.la
+libgdk-1.1.la
gdkcursors.h
gdkkeysyms.h
diff --git a/glib/.cvsignore b/glib/.cvsignore
index fb21b2098d..b03d5fc074 100644
--- a/glib/.cvsignore
+++ b/glib/.cvsignore
@@ -5,7 +5,7 @@ configure
aclocal.m4
.deps
_libs
-libglib.la
+libglib-1.1.la
config.log
glibconfig.h
glib.h
diff --git a/glib/ChangeLog b/glib/ChangeLog
index 907b5455c2..48a162ede3 100644
--- a/glib/ChangeLog
+++ b/glib/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 6 14:09:22 PDT 1998 Manish Singh <yosh@gimp.org>
+
+ * gmem.c: commented out MEM_PROFILE and MEM_CHECK, causing weird
+ problems
+
Mon Jun 1 04:43:27 1998 Tim Janik <timj@gtk.org>
* ghash.c (g_hash_table_insert): wrote a comment describing why
diff --git a/glib/gmem.c b/glib/gmem.c
index 5d51a856b6..27f0cf900c 100644
--- a/glib/gmem.c
+++ b/glib/gmem.c
@@ -21,8 +21,8 @@
#include "glib.h"
-#define MEM_PROFILE
-#define MEM_CHECK
+/* #define MEM_PROFILE */
+/* #define MEM_CHECK */
#define MAX_MEM_AREA 65536L
diff --git a/gtk/.cvsignore b/gtk/.cvsignore
index 94ab179c28..967962f4be 100644
--- a/gtk/.cvsignore
+++ b/gtk/.cvsignore
@@ -4,10 +4,11 @@ Makefile.in
.deps
_libs
.libs
-libgtk.la
+libgtk-1.1.la
testgtk
testinput
testselection
simple
testtree
gtkfeatures.h
+testthreads