diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-08 17:39:32 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-08 17:39:32 +0100 |
| commit | d68f49ffc0e4b39ed842032a1e365870d2597adf (patch) | |
| tree | 7befe15e9cd0ae9fede0f2d883a1f4f789ee3959 /CMakeLists.txt | |
| parent | 0cb8ff40b26401a707781c2c4171d3ec6c114077 (diff) | |
| parent | c6f0d9ce937349aaab0ed7ee3968c73bf721665c (diff) | |
| download | MultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.tar MultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.tar.gz MultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.tar.lz MultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.tar.xz MultiMC-d68f49ffc0e4b39ed842032a1e365870d2597adf.zip | |
Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into develop
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index beaa9bb1..11b64c3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,6 +300,8 @@ logic/net/HttpMetaCache.h logic/net/HttpMetaCache.cpp logic/net/S3ListBucket.h logic/net/S3ListBucket.cpp +logic/net/PasteUpload.h +logic/net/PasteUpload.cpp # Yggdrasil login stuff logic/auth/MojangAccount.h |