[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[750] trunk
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[750] trunk
|
From: <fr...@us...> - 2013-05-19 10:36:50
|
Revision: 750
http://sourceforge.net/p/fuse-for-macosx/code/750
Author: fredm
Date: 2013-05-19 10:36:47 +0000 (Sun, 19 May 2013)
Log Message:
-----------
Merge up to vendor 1.1.0 release branches r4959.
Revision Links:
--------------
http://sourceforge.net/p/fuse-for-macosx/code/4959
Modified Paths:
--------------
trunk/fuse/ChangeLog
trunk/fuse/README
trunk/fuse/fusepb/English.lproj/InfoPlist.strings
trunk/fuse/fusepb/Info-Fuse.plist
trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
trunk/fuse/hacking/ChangeLog
trunk/fuse/man/fuse.1
trunk/libspectrum/libspectrum/ChangeLog
trunk/libspectrum/libspectrum/Makefile.am
trunk/libspectrum/libspectrum/README
trunk/libspectrum/libspectrum/doc/libspectrum.3
trunk/libspectrum/libspectrum/hacking/ChangeLog
Property Changed:
----------------
trunk/fuse/
trunk/libspectrum/libspectrum/
Index: trunk/fuse
===================================================================
--- trunk/fuse 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse 2013-05-19 10:36:47 UTC (rev 750)
Property changes on: trunk/fuse
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,5 ##
/vendor/fuse-emulator/0.10.0/fuse:556-557
/vendor/fuse-emulator/0.10.0-pre1/fuse:545-546
-/vendor/fuse-emulator/current/fuse:530-746
+/vendor/fuse-emulator/current/fuse:530-749
/vendor/fuse-emulator/fuse-1.0.0a/fuse:668-669
/vendor/fuse-emulator/fuse-r4617/fuse:686
\ No newline at end of property
Modified: trunk/fuse/ChangeLog
===================================================================
--- trunk/fuse/ChangeLog 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,4 +1,4 @@
-201?-??-?? Philip Kendall <phi...@sh...>
+2013-05-18 Philip Kendall <phi...@sh...>
* Fuse 1.1.0 released.
@@ -1094,4 +1094,4 @@
* Version 0.1.0 released.
-$Id: ChangeLog 4879 2013-02-12 00:36:01Z zubzero $
+$Id: ChangeLog 4944 2013-05-16 20:55:22Z pak21 $
Modified: trunk/fuse/README
===================================================================
--- trunk/fuse/README 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/README 2013-05-19 10:36:47 UTC (rev 750)
@@ -25,7 +25,7 @@
* Support for the RZX input recording file format, including
rollback and 'competition mode'.
* Emulation of the DivIDE, Interface 1, Kempston mouse, Spectrum +3e,
- ZXATASP, ZXCF, Beta 128, Opus Discovery and +D interfaces.
+ ZXATASP, ZXCF, Beta 128, Opus Discovery, +D and DISCiPLE interfaces.
Help! <xyz> doesn't work
------------------------
@@ -105,6 +105,6 @@
<http://www.worldofspectrum.org/forums/>.
Philip Kendall <phi...@sh...>
-?? ???? 2012
+18th May, 2013
-$Id: README 4846 2013-01-03 09:14:29Z zubzero $
+$Id: README 4958 2013-05-18 13:07:46Z zubzero $
Modified: trunk/fuse/fusepb/English.lproj/InfoPlist.strings
===================================================================
(Binary files differ)
Modified: trunk/fuse/fusepb/Info-Fuse.plist
===================================================================
--- trunk/fuse/fusepb/Info-Fuse.plist 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/fusepb/Info-Fuse.plist 2013-05-19 10:36:47 UTC (rev 750)
@@ -552,7 +552,7 @@
<key>CFBundleSignature</key>
<string>FUSE</string>
<key>CFBundleVersion</key>
- <string>4915</string>
+ <string>1.1.0</string>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>
Modified: trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html
===================================================================
--- trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/fusepb/resources/Fuse Help/html/changelog.html 2013-05-19 10:36:47 UTC (rev 750)
@@ -25,7 +25,11 @@
elsewhere and then the Fuse preferences set to refer to
these new ROM images. This applies to the following
machines; Pentagon series and Scorpion, and the following
- interfaces; Interface I, Opus Discovery, Betadisk.<br>
+ interfaces; Interface I, Opus Discovery, Betadisk.</font></li>
+ <li><font face="Lucida Grande,Helvetica,Arial">Any changes
+ that enable and disable peripherals may result in a hard
+ reset of the emulated machine if required for proper
+ emulation of the hardware.<br>
</font></li>
</ul>
<br>
@@ -35,9 +39,7 @@
list-style-position: outside;">
<ul>
<li><font face="Lucida Grande,Helvetica,Arial">Add Spectranet
- ethernet interface emulation (Philip Kendall).</font></li>
- <li><font face="Lucida Grande,Helvetica,Arial">Add SpeccyBoot
- ethernet interface emulation (Patrik Persson).</font></li>
+ Ethernet interface emulation (Philip Kendall).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Add SpecDrum
sound interface emulation (Jon Mitchell).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Add DISCiPLE
@@ -110,8 +112,7 @@
<li><font face="Lucida Grande,Helvetica,Arial">Update SE ROMs
to v4.04 (Fredrick Meunier).</font></li>
<li><font face="Lucida Grande,Helvetica,Arial">Update to v1.38
- of the +3e ROMs (fixes bug #290) (thanks, Guesser)
- (Fredrick Meunier).<br>
+ of the +3e ROMs (thanks, Guesser) (Fredrick Meunier).<br>
</font></li>
</ul>
</li>
Modified: trunk/fuse/hacking/ChangeLog
===================================================================
--- trunk/fuse/hacking/ChangeLog 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/hacking/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
@@ -4480,3 +4480,7 @@
complete some missing field initializers (Sergio).
20130505 peripherals/if1.c: put braces around empty body in ‘do’ statements
(Sergio).
+20130516 man/fuse.1: update date and version for 1.1 release.
+20130516 ChangeLog: update date in main changelog.
+20130517 README: update date for 1.1 release.
+20130518 README: mention DISCiPLE support (Stuart).
Modified: trunk/fuse/man/fuse.1
===================================================================
--- trunk/fuse/man/fuse.1 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/fuse/man/fuse.1 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" fuse.1: Fuse man page
-.\" Copyright (c) 2001-2010 Russell Marks, Philip Kendall, Darren Salt,
+.\" Copyright (c) 2001-2013 Russell Marks, Philip Kendall, Darren Salt,
.\" Fredrick Meunier, Stuart Brady
.\"
.\" This program is free software; you can redistribute it and/or modify
@@ -23,7 +23,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH fuse 1 "??th ????, 201?" "Version 1.1.0" "Emulators"
+.TH fuse 1 "18th May, 2013" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Index: trunk/libspectrum/libspectrum
===================================================================
--- trunk/libspectrum/libspectrum 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum 2013-05-19 10:36:47 UTC (rev 750)
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-740
+/vendor/fuse-emulator/current/libspectrum:530-749
/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 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,4 +1,4 @@
-201?-??-?? Philip Kendall <phi...@sh...>
+2013-05-18 Philip Kendall <phi...@sh...>
* libspectrum 1.1.0 released.
@@ -333,5 +333,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 4801 2012-12-26 10:55:01Z fredm $
+$Id: ChangeLog 4948 2013-05-16 21:00:24Z pak21 $
Modified: trunk/libspectrum/libspectrum/Makefile.am
===================================================================
--- trunk/libspectrum/libspectrum/Makefile.am 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/Makefile.am 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
-## Copyright (c) 2001-2004 Philip Kendall
+## Copyright (c) 2001-2013 Philip Kendall
-## $Id: Makefile.am 4757 2012-11-07 11:14:48Z fredm $
+## $Id: Makefile.am 4935 2013-05-16 19:43:50Z pak21 $
## 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
@@ -63,7 +63,7 @@
zlib.c \
zxs.c
-libspectrum_la_LDFLAGS = -version-info 8:0:0 -no-undefined @WINDRES_LDFLAGS@
+libspectrum_la_LDFLAGS = -version-info 9:0:0 -no-undefined @WINDRES_LDFLAGS@
libspectrum_la_LIBADD = @AUDIOFILE_LIBS@ @GLIB_LIBS@ -lm
Modified: trunk/libspectrum/libspectrum/README
===================================================================
--- trunk/libspectrum/libspectrum/README 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/README 2013-05-19 10:36:47 UTC (rev 750)
@@ -67,6 +67,6 @@
Then, type "make" and if everything went well, "make install".
Philip Kendall <phi...@sh...>
-?? ??? 201?
+18th May, 2013
-$Id: README 4801 2012-12-26 10:55:01Z fredm $
+$Id: README 4951 2013-05-17 18:48:41Z pak21 $
Modified: trunk/libspectrum/libspectrum/doc/libspectrum.3
===================================================================
--- trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/doc/libspectrum.3 2013-05-19 10:36:47 UTC (rev 750)
@@ -1,7 +1,7 @@
.\" -*- nroff -*-
.\"
.\" libspectrum.3: libspectrum summary
-.\" Copyright (c) 2004-2008 Philip Kendall
+.\" Copyright (c) 2004-2013 Philip Kendall
.\"
.\" 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
@@ -22,7 +22,7 @@
.\" E-mail: phi...@sh...
.\"
.\"
-.TH libspectrum 3 "16th December, 2010" "Version 1.0.0" "Emulators"
+.TH libspectrum 3 "18th May, 2013" "Version 1.1.0" "Emulators"
.\"
.\"------------------------------------------------------------------
.\"
Modified: trunk/libspectrum/libspectrum/hacking/ChangeLog
===================================================================
--- trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-18 13:41:18 UTC (rev 749)
+++ trunk/libspectrum/libspectrum/hacking/ChangeLog 2013-05-19 10:36:47 UTC (rev 750)
@@ -942,3 +942,7 @@
patch #305).
20130307 accessor.pl,snap_accessors.txt,szx.c: implement Spectranet's "suppress
NMI" flipflop (bug #259).
+20130516 Makefile.am: update library version number for 1.1 release.
+20130516 doc/libspectrum.3: update version number and date for 1.1 release.
+20130516 ChangeLog: update date in main changelog.
+20130517 README: update one more date for the 1.1 release.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
