Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into develop

2013-12-08 17:39:32 +01:00
parent 0cb8ff40b2 c6f0d9ce93
commit d68f49ffc0
6 changed files with 136 additions and 0 deletions
--- 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