diff options
| author | Alyssa Milburn | 2012-08-28 15:39:00 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2012-08-28 15:54:12 +0200 |
| commit | 31801137b5c6908edd76f357b3f29b07e9e3be84 (patch) | |
| tree | 33e973717545ae27da6ba4996d0d8fe1bcd437b3 /dists/scummvm.6 | |
| parent | 35fd91793b34b72624a89f2a76f45bc8e59020d2 (diff) | |
| parent | 6ab8db638e4a1d547ee67db067b5d6c3d6c940a4 (diff) | |
| download | scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.tar.gz scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.tar.bz2 scummvm-rg350-31801137b5c6908edd76f357b3f29b07e9e3be84.zip | |
Merge remote-tracking branch 'origin/master' into tony
Conflicts:
common/coroutines.cpp
common/coroutines.h
devtools/create_project/msbuild.cpp
devtools/create_project/visualstudio.cpp
Diffstat (limited to 'dists/scummvm.6')
| -rw-r--r-- | dists/scummvm.6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dists/scummvm.6 b/dists/scummvm.6 index b192104684..2075a5c8f5 100644 --- a/dists/scummvm.6 +++ b/dists/scummvm.6 @@ -37,7 +37,7 @@ Output using ALSA sequencer device .It Em amidi Use the MorphOS MIDI system, for MorphOS users .It Em core -CoreAudio sound, for MacOS X users +CoreAudio sound, for Mac OS X users .It Em mt32 MT-32 emulation .It Em null |