Changeset 15199

Timestamp:

11/22/19 14:52:44 (4 years ago)

Author:

Mark Evenson

Message:

Merge <​https://github.com/armedbear/abcl/commit/199dcd81c28664368fa892c6c50b4e04313246f5>.

Location:

trunk/abcl

Files:

• CHANGES (modified) (1 diff)
• abcl.rdf (modified) (2 diffs)
• doc/manual/abcl.tex (modified) (1 diff)
• src/org/armedbear/lisp/Version.java (modified) (1 diff)

trunk/abcl/CHANGES

@@ +1 @@
+Version 1.6.1
+=============
+unreleased
+
 Version 1.6.0
 =============

trunk/abcl/abcl.rdf

@@ -17 +17 @@
 <> 
   abcl:branch           <http://abcl.org/svn/trunk/abcl> ;
-  dc:identifier         <urn:abcl.org/1.6.0#release> ;           
+  dc:identifier         <urn:abcl.org/1.6.1#dev> ;           
   doap:language        "Common Lisp" ;
   dc:created           "01-JAN-2004" ;
   dc:modified          "22-NOV-2019" ;
-  dc:version           "abcl-1.6.0" ;
-  dc:release           "release" ;
+  dc:version           "abcl-1.6.1" ;
+  dc:release           "dev" ;
   abcl:git             <https://github.com/easye/abcl/> ; # Does this overwrite?  TODO Check RDF specs.
   abcl:git             <https://gitlab.common-lisp.net/abcl/abcl/> ;
-  abcl:svn             <http://abcl.org/trac/changeset/15185> . # UPDATE
+
+  abcl:svn                 <https://abcl.org/trac/changeset/15198> . # releng UPDATE
  
 <> 
@@ -116 +117 @@
      rdf:_9 <http://abcl.org/releases/1.4.0/abcl-1.4.0.jar> ;
      rdf:_10 <http://abcl.org/releases/1.5.0/abcl-1.5.0.jar> ;
+     rdf:_10 <http://abcl.org/releases/1.6.0/abcl-1.6.0.jar> ;
   ] ;
 ] .

trunk/abcl/doc/manual/abcl.tex

@@ -10 +10 @@
 \begin{document}
 \title{Armed Bear Common Lisp User Manual}
-\date{Version 1.6.0\\
+\date{Version 1.6.1\\
 \smallskip
-November 2019}
+Unreleased}
 \author{Mark Evenson \and Erik H\"{u}lsmann \and Rudolf Schlatte \and
   Alessio Stalla \and Ville Voutilainen}

trunk/abcl/src/org/armedbear/lisp/Version.java

@@ -42 +42 @@
   private Version() {}
   
-  static final String baseVersion = "1.6.0-rc-0";
+  static final String baseVersion = "1.6.1-dev";
   
   static void init() {