Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

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

Snippets Groups Projects

c2616bae

Commit c2616bae authored 6 years ago by Pregmodder

Downloads
- Plain Diff

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

parents 8006445a 6be6f104

No related branches found

No related tags found

2 merge requests!2047RA rework,!1682Bit of text cleaning

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/init/setupVars.tw 21 additions, 21 deletions

src/init/setupVars.tw
src/pregmod/csec.tw 31 additions, 0 deletions

src/pregmod/csec.tw
src/pregmod/eliteTakeOverResult.tw 2 additions, 2 deletions

src/pregmod/eliteTakeOverResult.tw
src/pregmod/widgets/seBirthWidgets.tw 0 additions, 1 deletion

src/pregmod/widgets/seBirthWidgets.tw
src/uncategorized/pRivalryHostage.tw 2 additions, 2 deletions

src/uncategorized/pRivalryHostage.tw
src/uncategorized/randomIndividualEvent.tw 0 additions, 4 deletions

src/uncategorized/randomIndividualEvent.tw

with 56 additions and 30 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