diff options
| author | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
| commit | 84063dc9727a9f55e09d39574027beab695680e6 (patch) | |
| tree | d71a9599cb550d9f7949a2d3209574064e054d85 /backends/fs/wii | |
| parent | c6e89df3d940747a85d447f172e2323c800f5eaf (diff) | |
| parent | a39a3eda46aea108a51556f001617ad28d29e520 (diff) | |
| download | scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.gz scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.bz2 scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.zip | |
Merge remote-tracking branch 'origin/master' into soltys_wip2
Diffstat (limited to 'backends/fs/wii')
| -rw-r--r-- | backends/fs/wii/wii-fs-factory.cpp | 1 | ||||
| -rw-r--r-- | backends/fs/wii/wii-fs-factory.h | 1 | ||||
| -rw-r--r-- | backends/fs/wii/wii-fs.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/backends/fs/wii/wii-fs-factory.cpp b/backends/fs/wii/wii-fs-factory.cpp index fbc9ef1da8..760e5316e7 100644 --- a/backends/fs/wii/wii-fs-factory.cpp +++ b/backends/fs/wii/wii-fs-factory.cpp @@ -218,4 +218,3 @@ void WiiFilesystemFactory::umountUnused(const String &path) { } #endif - diff --git a/backends/fs/wii/wii-fs-factory.h b/backends/fs/wii/wii-fs-factory.h index 42795ebf33..913c0a3b64 100644 --- a/backends/fs/wii/wii-fs-factory.h +++ b/backends/fs/wii/wii-fs-factory.h @@ -85,4 +85,3 @@ private: }; #endif /*Wii_FILESYSTEM_FACTORY_H*/ - diff --git a/backends/fs/wii/wii-fs.cpp b/backends/fs/wii/wii-fs.cpp index eb631df1bf..4a19e18240 100644 --- a/backends/fs/wii/wii-fs.cpp +++ b/backends/fs/wii/wii-fs.cpp @@ -202,4 +202,3 @@ Common::WriteStream *WiiFilesystemNode::createWriteStream() { } #endif //#if defined(__WII__) - |