diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-10-26 20:23:26 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-10-26 20:23:26 +0200 |
| commit | c46292c9b1c153f2d17554690e90db1c8efe4d23 (patch) | |
| tree | a54a29be846e76b2b57fed03e74eb6fa5ddcf978 /CMakeLists.txt | |
| parent | 1f28a3b8af228ec40412571859f15ea216ccb52a (diff) | |
| parent | 923347729557eed76e4f7e9f6f5f1a79216de0a4 (diff) | |
| download | MultiMC-c46292c9b1c153f2d17554690e90db1c8efe4d23.tar MultiMC-c46292c9b1c153f2d17554690e90db1c8efe4d23.tar.gz MultiMC-c46292c9b1c153f2d17554690e90db1c8efe4d23.tar.lz MultiMC-c46292c9b1c153f2d17554690e90db1c8efe4d23.tar.xz MultiMC-c46292c9b1c153f2d17554690e90db1c8efe4d23.zip | |
Merge branch 'develop'
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b7dd6ea3..16825be3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,7 +241,7 @@ logic/InstanceLauncher.h logic/InstanceLauncher.cpp # network stuffs -logic/net/Download.h +logic/net/NetAction.h logic/net/FileDownload.h logic/net/FileDownload.cpp logic/net/ByteArrayDownload.h @@ -250,12 +250,15 @@ logic/net/CacheDownload.h logic/net/CacheDownload.cpp logic/net/ForgeXzDownload.h logic/net/ForgeXzDownload.cpp -logic/net/DownloadJob.h -logic/net/DownloadJob.cpp +logic/net/NetJob.h +logic/net/NetJob.cpp logic/net/HttpMetaCache.h logic/net/HttpMetaCache.cpp logic/net/LoginTask.h logic/net/LoginTask.cpp +logic/net/S3ListBucket.h +logic/net/S3ListBucket.cpp + # legacy instances logic/LegacyInstance.h |