diff options
author | Jan Dalheimer <jan@dalheimer.de> | 2013-12-16 21:17:50 +0100 |
---|---|---|
committer | Jan Dalheimer <jan@dalheimer.de> | 2013-12-16 21:17:50 +0100 |
commit | 47bf7fff27665496bc4212bcaccc80350f665f97 (patch) | |
tree | 878fd220464c5280fcbe589d3ed738ce0306ab2a /mmc_updater/src/UpdateScript.h | |
parent | ae68adc3a536525990b0668703fd74eded8ccfde (diff) | |
parent | dff00a6d2abb84a93e48ff00dda16444550d859f (diff) | |
download | MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.tar MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.tar.gz MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.tar.lz MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.tar.xz MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.zip |
Merge remote-tracking branch 'upstream/develop' into updater_tests
Conflicts:
mmc_updater/src/tests/CMakeLists.txt
Diffstat (limited to 'mmc_updater/src/UpdateScript.h')
-rw-r--r-- | mmc_updater/src/UpdateScript.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mmc_updater/src/UpdateScript.h b/mmc_updater/src/UpdateScript.h index c825e35d..5c863ff4 100644 --- a/mmc_updater/src/UpdateScript.h +++ b/mmc_updater/src/UpdateScript.h @@ -56,9 +56,7 @@ class UpdateScriptFile } }; -/** Stores information about the packages and files included - * in an update, parsed from an XML file. - */ +/** Stores information about the files included in an update, parsed from an XML file. */ class UpdateScript { public: |