diff options
| author | 2015-12-28 11:27:47 +0100 | |
|---|---|---|
| committer | 2015-12-28 11:27:47 +0100 | |
| commit | 2a5e044fc23624a388bdb5f82ef9c11cbed6a9c7 (patch) | |
| tree | b468f54cdcbb7252d14790a7a013b138b1bd9b03 /src/lib/formats/atari_dsk.cpp | |
| parent | 077fe7ad89d65bbeafde141c9b3f71ca8df42f1c (diff) | |
| parent | 11fcbaa28583023ea93a8f0c1f3fb9082d3295ab (diff) | |
Merge https://github.com/mamedev/mame
# Conflicts:
# src/devices/video/ef9365.cpp
Diffstat (limited to 'src/lib/formats/atari_dsk.cpp')
| -rw-r--r-- | src/lib/formats/atari_dsk.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/formats/atari_dsk.cpp b/src/lib/formats/atari_dsk.cpp index f5ccd03c952..d73cbf8185f 100644 --- a/src/lib/formats/atari_dsk.cpp +++ b/src/lib/formats/atari_dsk.cpp @@ -31,7 +31,7 @@ LEGACY_FLOPPY_OPTIONS_START( atari_only ) "Atari floppy disk image", atari_dsk_identify, atari_dsk_construct, - NULL, - NULL + nullptr, + nullptr ) LEGACY_FLOPPY_OPTIONS_END0 |
