[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[836] trunk/libspectrum/libspectrum

[<fr...@us...>]

Revision: 836
          http://sourceforge.net/p/fuse-for-macosx/code/836
Author:   fredm
Date:     2016-11-04 00:44:22 +0000 (Fri, 04 Nov 2016)
Log Message:
-----------
Merge up to vendor last SVN trunk (r5829) prior to git migration.

Revision Links:
--------------
    http://sourceforge.net/p/fuse-for-macosx/code/5829

Modified Paths:
--------------
    trunk/libspectrum/libspectrum/ChangeLog
    trunk/libspectrum/libspectrum/Makefile.am
    trunk/libspectrum/libspectrum/README
    trunk/libspectrum/libspectrum/configure.ac
    trunk/libspectrum/libspectrum/doc/libspectrum.txt
    trunk/libspectrum/libspectrum/hacking/ChangeLog

Property Changed:
----------------
    trunk/libspectrum/libspectrum/

Index: trunk/libspectrum/libspectrum
===================================================================
--- trunk/libspectrum/libspectrum	2016-11-04 00:30:44 UTC (rev 835)
+++ trunk/libspectrum/libspectrum	2016-11-04 00:44:22 UTC (rev 836)

Property changes on: trunk/libspectrum/libspectrum
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
 /vendor/fuse-emulator/0.10.0/libspectrum:556-557
 /vendor/fuse-emulator/0.10.0-pre1/libspectrum:545-546
-/vendor/fuse-emulator/current/libspectrum:530-828
+/vendor/fuse-emulator/current/libspectrum:530-835
 /vendor/fuse-emulator/fuse-1.0.0a/libspectrum:668-669
 /vendor/fuse-emulator/fuse-r4617/libspectrum:686
\ No newline at end of property
Modified: trunk/libspectrum/libspectrum/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/ChangeLog	2016-11-04 00:30:44 UTC (rev 835)
+++ trunk/libspectrum/libspectrum/ChangeLog	2016-11-04 00:44:22 UTC (rev 836)
@@ -423,5 +423,5 @@
 	* libspectrum separated from Fuse just before the 0.5.0 release of
 	  Fuse; see Fuse's ChangeLog for changes up to this point
 
-$Id: ChangeLog 5815 2016-10-02 11:27:20Z fredm $
+$Id: ChangeLog 5827 2016-10-18 11:43:10Z fredm $
 

Modified: trunk/libspectrum/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/libspectrum/Makefile.am	2016-11-04 00:30:44 UTC (rev 835)
+++ trunk/libspectrum/libspectrum/Makefile.am	2016-11-04 00:44:22 UTC (rev 836)
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 ## Copyright (c) 2001-2016 Philip Kendall
 
-## $Id: Makefile.am 5810 2016-09-24 07:02:20Z sbaldovi $
+## $Id: Makefile.am 5827 2016-10-18 11:43:10Z fredm $
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by

Modified: trunk/libspectrum/libspectrum/README
===================================================================
--- trunk/libspectrum/libspectrum/README	2016-11-04 00:30:44 UTC (rev 835)
+++ trunk/libspectrum/libspectrum/README	2016-11-04 00:44:22 UTC (rev 836)
@@ -69,4 +69,4 @@
 Philip Kendall <phi...@sh...>
 2nd October, 2016
 
-$Id: README 5815 2016-10-02 11:27:20Z fredm $
+$Id: README 5827 2016-10-18 11:43:10Z fredm $

Modified: trunk/libspectrum/libspectrum/configure.ac
===================================================================
--- trunk/libspectrum/libspectrum/configure.ac	2016-11-04 00:30:44 UTC (rev 835)
+++ trunk/libspectrum/libspectrum/configure.ac	2016-11-04 00:44:22 UTC (rev 836)
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl Copyright (c) 1999-2013 Philip Kendall
 
-dnl $Id: configure.ac 5806 2016-09-24 04:13:08Z fredm $
+dnl $Id: configure.ac 5827 2016-10-18 11:43:10Z fredm $
 
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by

Modified: trunk/libspectrum/libspectrum/doc/libspectrum.txt
===================================================================
--- trunk/libspectrum/libspectrum/doc/libspectrum.txt	2016-11-04 00:30:44 UTC (rev 835)
+++ trunk/libspectrum/libspectrum/doc/libspectrum.txt	2016-11-04 00:44:22 UTC (rev 836)
@@ -1868,4 +1868,4 @@
 
 Write `data' to register `reg' of the IDE channel `chn'.
 
-$Id: libspectrum.txt 5808 2016-09-24 04:23:35Z fredm $
+$Id: libspectrum.txt 5827 2016-10-18 11:43:10Z fredm $

Modified: trunk/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/hacking/ChangeLog	2016-11-04 00:30:44 UTC (rev 835)
+++ trunk/libspectrum/libspectrum/hacking/ChangeLog	2016-11-04 00:44:22 UTC (rev 836)
@@ -1128,3 +1128,5 @@
          since libspectrum 1.2.2 (Sergio).
 20161002 ChangeLog,README,doc/libspectrum.3: update release dates for 1.3.0
          (Fred).
+20161018 ChangeLog,Makefile.am,README,configure.ac,doc/{libspectrum.3,
+         libspectrum.txt}: merge changes from 1.3.0 release (Fred).

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.