Petr Mrázek aa61bbe9e4 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop ...

Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp

2013-12-10 07:22:22 +01:00

..

ByteArrayDownload.cpp

…

ByteArrayDownload.h

…

CacheDownload.cpp

…

CacheDownload.h

…

ForgeMirror.h

…

ForgeMirrors.cpp

…

ForgeMirrors.h

…

ForgeXzDownload.cpp

…

ForgeXzDownload.h

…

HttpMetaCache.cpp

…

HttpMetaCache.h

…

MD5EtagDownload.cpp

Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

2013-12-10 07:22:22 +01:00

MD5EtagDownload.h

Finish assets update for 1.7.3

2013-12-10 07:12:52 +01:00

NetAction.h

…

NetJob.cpp

Finish assets update for 1.7.3

2013-12-10 07:12:52 +01:00

NetJob.h

Finish assets update for 1.7.3

2013-12-10 07:12:52 +01:00

PasteUpload.cpp

Open the url direectly.

2013-12-06 17:17:32 -05:00

PasteUpload.h

Open the url direectly.

2013-12-06 17:17:32 -05:00

S3ListBucket.cpp

…

S3ListBucket.h

…