Merge commit '7326ff096d0fc60086f2' into v0.8.0

2020-04-04 17:52:44 -07:00
parent d8716aad4c 7326ff096d
commit 1e687b9392
53 changed files with 3081 additions and 1739 deletions
@@ -3,6 +3,11 @@ game, as well as both integer and string names for each one.  Running
 gen_resfiles.py will cause it to regenerate uqm.rmp, all the .ls2
 files, and the i*.h source headers that produce the #defines.

+XXX The information below is out of date. See the section 'Updating
+the core resources' in sc2/doc/devel/resources for an up-to-date
+description of the contents of the resources.csv file.
+
+
 The .csv file itself is a comma-separated-values list with nine
 fields: