Menu

libspectrum Merge Request #6: (arki55 fork) arki55/features/T1-d40-snapshots ==> (fuse) master (rejected)

Merging...

Merged

Something went wrong. Please, merge manually

Checking if merge is possible...

Something went wrong. Please, merge manually

Arki55 wants to merge 4 commits from /u/arki55/libspectrum/ to master, 2023-05-04

Commit Date  
[8b9b05] (arki55/features/T1-d40-snapshots) by Miroslav Ďurčík / Arki55 Miroslav Ďurčík / Arki55

chore: changed c++ comments to C style

<https://sourceforge.net/p/arki55-fuse-mod/tickets/1/>

2023-04-23 19:58:52 Tree
[4c8a30] by Miroslav Ďurčík / Arki55 Miroslav Ďurčík / Arki55

chore: Adjsted comments in dsnap.c

2022-11-19 23:03:42 Tree
[5c1ecb] by Miroslav Ďurčík / Arki55 Miroslav Ďurčík / Arki55

fix: Fix loading of DI/EI information from D40's snap (.S) format. I would assume that libspectrum_snap_set_iff1() and libspectrum_snap_set_iff2() was defaulting to 0 if not explicitly used, but debugging has shown otherwise. It has to be set to 0 as well.
feat: Implemented saving of .S snapshot file.

2022-11-19 21:07:33 Tree
[b2f393] by Miroslav Durcik / Arki55 Miroslav Durcik / Arki55

Added loading of .S snapshot files from D40's floppy files
https://sourceforge.net/u/arki55/tickets/1/

2022-11-09 19:05:01 Tree

Discussion

  • Arki55

    Arki55 - 2023-04-23

    Comments corrected in dsnap.c file.

     
  • Arki55

    Arki55 - 2023-04-25

    I've added new merge request with squash merged and corrected commit message.
    Is that better ?

    https://sourceforge.net/p/fuse-emulator/libspectrum/merge-requests/11/

     
  • Sergio Baldoví

    Sergio Baldoví - 2023-05-04
    • Status: open --> rejected
     
  • Sergio Baldoví

    Sergio Baldoví - 2023-05-04

    Thank you. Both are ok. Don't worry, I can amend any merge request.

    Finally merged merge-request #11.

     

Log in to post a comment.

Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.