Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

bc98df3b

Commit bc98df3b authored 7 years ago by hexall90

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into societalEliteEnding

updating fork

parents 484d4ced f618ba78

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/gui/Encyclopedia/encyclopediaWidgets.tw 1 addition, 1 deletion

src/gui/Encyclopedia/encyclopediaWidgets.tw
src/uncategorized/RESS.tw 1 addition, 1 deletion

src/uncategorized/RESS.tw
src/uncategorized/RETS.tw 20 additions, 0 deletions

src/uncategorized/RETS.tw
src/uncategorized/cosmeticRulesAssistantSettings.tw 0 additions, 2 deletions

src/uncategorized/cosmeticRulesAssistantSettings.tw
src/uncategorized/main.tw 5 additions, 3 deletions

src/uncategorized/main.tw
src/uncategorized/randomIndividualEvent.tw 2 additions, 0 deletions

src/uncategorized/randomIndividualEvent.tw
src/uncategorized/saRules.tw 4 additions, 1 deletion

src/uncategorized/saRules.tw
src/uncategorized/slaveAssignmentsReport.tw 1 addition, 1 deletion

src/uncategorized/slaveAssignmentsReport.tw
src/utility/descriptionWidgets.tw 40 additions, 34 deletions

src/utility/descriptionWidgets.tw

with 74 additions and 43 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment