[armedbear-cvs] r14303 - branches/1.1.x

[mevenson at common-lisp.net]

Author: mevenson
Date: Thu Dec  6 13:01:44 2012
New Revision: 14303

Log:
doc: Remove reference to abcl-1.1.0-dev in README.

Modified:
   branches/1.1.x/README
   branches/1.1.x/abcl.rdf

Modified: branches/1.1.x/README
==============================================================================
--- branches/1.1.x/README	Thu Dec  6 12:17:35 2012	(r14302)
+++ branches/1.1.x/README	Thu Dec  6 13:01:44 2012	(r14303)
@@ -186,7 +186,7 @@
 
 ### Tests 
 
-ABCL 1.1.0-dev now fails only 1[4-6] out of 21708 total tests in the ANSI CL
+ABCL 1.1.0 now fails only 1[4-6] out of 21708 total tests in the ANSI CL
 test suite (derived from the tests originally written for GCL).
 
 Maxima's test suite runs without failures.

Modified: branches/1.1.x/abcl.rdf
==============================================================================
--- branches/1.1.x/abcl.rdf	Thu Dec  6 12:17:35 2012	(r14302)
+++ branches/1.1.x/abcl.rdf	Thu Dec  6 13:01:44 2012	(r14303)
@@ -22,12 +22,23 @@
   dc:created           "01-JAN-2004" ;
   dc:modified          "06-DEC-2012" ;
 
+<<<<<<< local
+<> dc:version           "abcl-1.1.0" .
+<>  a abcl:releaseCandidate   "rc-3" .
+=======
   dc:version           "abcl-1.1.0" ;
   abcl:releaseCandidate      "rc-3" .
+>>>>>>> other
 
+<<<<<<< local
+<> rdfs:seeAlso <file:README> .
+<> rdfs:seeAlso <file:MANUAL> .
+<> rdfs:seeAlso <file:doc/manual/abcl.tex> .
+=======
 <> 
   rdfs:seeAlso <README> ;
   rdfs:seeAlso <file:doc/manual/abcl.tex> .
+>>>>>>> other
 
 @prefix dc:              <http://purl.org/dc/elements/1.1/> .