summaryrefslogtreecommitdiffstats
path: root/depends/launcher/org
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-12 23:04:05 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-12 23:04:05 +0100
commit54a9ee5eb03b6d1be6294e47179b9eb76f7a3949 (patch)
tree6454c95549fe42183d8b285a89517a734a6da5dc /depends/launcher/org
parentf552366e03cd6bd693850e24503bf3bf3559cfd0 (diff)
parent8950953d915ba234f62da93b520a1b82594cb9dc (diff)
downloadMultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.tar
MultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.tar.gz
MultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.tar.lz
MultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.tar.xz
MultiMC-54a9ee5eb03b6d1be6294e47179b9eb76f7a3949.zip
Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 into develop
Conflicts: gui/dialogs/SettingsDialog.cpp gui/dialogs/SettingsDialog.ui
Diffstat (limited to 'depends/launcher/org')
0 files changed, 0 insertions, 0 deletions