diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
| commit | 9d724e0fe4bfb7b7940f3f0c9719affd22a18722 (patch) | |
| tree | c73e9566e134d2b78e6f1b8bce3c32159b17675f /resources | |
| parent | a9dfe6d7ec949954b07facff71ee6023e0ced9ee (diff) | |
| parent | a00fb1e8da505768b491e5f4d6266784fb1a27c9 (diff) | |
| download | MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.gz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.lz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.xz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.zip | |
Merge remote-tracking branch 'origin/feature_cmake_style' into develop
Conflicts:
CMakeLists.txt
Diffstat (limited to 'resources')
0 files changed, 0 insertions, 0 deletions