[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 19/19: Merge commit '5b7632331e7551ac202bbaba37c572b96a7
From: |
Andy Wingo |
Subject: |
[Guile-commits] 19/19: Merge commit '5b7632331e7551ac202bbaba37c572b96a791c6e' |
Date: |
Thu, 22 Jan 2015 13:54:51 +0000 |
wingo pushed a commit to branch master
in repository guile.
commit 4247d8e34e410032a8a1f1fe036201c2be431090
Merge: 0a5b437 5b76323
Author: Andy Wingo <address@hidden>
Date: Thu Jan 22 14:54:17 2015 +0100
Merge commit '5b7632331e7551ac202bbaba37c572b96a791c6e'
Conflicts:
module/oop/goops.scm
module/oop/goops.scm | 39 ++++++++++++++++++++++++++-------------
test-suite/tests/goops.test | 39 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 64 insertions(+), 14 deletions(-)
diff --cc module/oop/goops.scm
index 6afd049,9ab1eb2..95be42a
--- a/module/oop/goops.scm
+++ b/module/oop/goops.scm
@@@ -1,6 -1,6 +1,6 @@@
;;; installed-scm-file
- ;;;; Copyright (C) 1998,1999,2000,2001,2002, 2003, 2006, 2009, 2010, 2011,
2013, 2014, 2015 Free Software Foundation, Inc.
-;;;; Copyright (C) 1998,1999,2000,2001,2002, 2003, 2006, 2009, 2010, 2011,
2014, 2015 Free Software Foundation, Inc.
++;;;; Copyright (C) 1998,1999,2000-2003,2006,2009-2011,2013-2015 Free Software
Foundation, Inc.
;;;; Copyright (C) 1993-1998 Erick Gallesio - I3S-CNRS/ESSI <address@hidden>
;;;;
;;;; This library is free software; you can redistribute it and/or
- [Guile-commits] 08/19: Merge commit '8cf2a7ba7432d68b9a055d29f18117be70375af9', (continued)
- [Guile-commits] 08/19: Merge commit '8cf2a7ba7432d68b9a055d29f18117be70375af9', Andy Wingo, 2015/01/22
- [Guile-commits] 10/19: Merge commit '7c433cbbce83bc9f2f9967afba00bbb68e312657', Andy Wingo, 2015/01/22
- [Guile-commits] 11/19: Merge commit '47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4', Andy Wingo, 2015/01/22
- [Guile-commits] 13/19: Merge commit 'cdcba5b2f6270de808e51b3b933374170611b91d', Andy Wingo, 2015/01/22
- [Guile-commits] 14/19: Merge commit '37b1453032488de582175270d1b3a1653ea81457', Andy Wingo, 2015/01/22
- [Guile-commits] 15/19: Merge commit '5943a62042432b86d757200ef595d7aebb5c9bac', Andy Wingo, 2015/01/22
- [Guile-commits] 18/19: Merge commit 'ed72201a795ac1c8d6c0288b6bb710f2bd0ebd9c', Andy Wingo, 2015/01/22
- [Guile-commits] 16/19: Merge commit '894d0b894daae001495c748b3352cd79918d3789', Andy Wingo, 2015/01/22
- [Guile-commits] 17/19: Merge commit '01a301d1b606b84d986b735049e7155d2f4cd6aa', Andy Wingo, 2015/01/22
- [Guile-commits] 12/19: Merge commit '5d971db802eaa8038db17e1aa5b4c69452739744', Andy Wingo, 2015/01/22
- [Guile-commits] 19/19: Merge commit '5b7632331e7551ac202bbaba37c572b96a791c6e',
Andy Wingo <=