summaryrefslogtreecommitdiff
path: root/oop
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2008-09-30 21:12:16 +0200
committerAndy Wingo <wingo@pobox.com>2008-09-30 21:12:16 +0200
commit999f1b26e74a7a8eb9e9e5e479f971e145aa7326 (patch)
tree5f80e3cdf6f70d5fae969d5350d17111365efc41 /oop
parentac0e91c42dac01b74f89260090273cdb7ff7e791 (diff)
parent89bc270db3c207b2210736f066ce18721e0dbc76 (diff)
downloadguile-999f1b26e74a7a8eb9e9e5e479f971e145aa7326.tar.gz
Merge commit 'origin/master' into vm
Conflicts: doc/Makefile.am ice-9/Makefile.am libguile/gc.c
Diffstat (limited to 'oop')
-rw-r--r--oop/.cvsignore2
-rw-r--r--oop/ChangeLog-2008 (renamed from oop/ChangeLog)0
-rw-r--r--oop/Makefile.am4
-rw-r--r--oop/goops/.cvsignore2
4 files changed, 2 insertions, 6 deletions
diff --git a/oop/.cvsignore b/oop/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/oop/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/oop/ChangeLog b/oop/ChangeLog-2008
index 6727ef3fb..6727ef3fb 100644
--- a/oop/ChangeLog
+++ b/oop/ChangeLog-2008
diff --git a/oop/Makefile.am b/oop/Makefile.am
index a48fcb080..dcc20985c 100644
--- a/oop/Makefile.am
+++ b/oop/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in.
##
-## Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
+## Copyright (C) 2000, 2004, 2006, 2008 Free Software Foundation, Inc.
##
## This file is part of GUILE.
##
@@ -30,4 +30,4 @@ subpkgdatadir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)/oop
subpkgdata_DATA = $(oop_sources)
TAGS_FILES = $(subpkgdata_DATA)
-EXTRA_DIST = $(oop_sources)
+EXTRA_DIST = $(oop_sources) ChangeLog-2008
diff --git a/oop/goops/.cvsignore b/oop/goops/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/oop/goops/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in