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

096a5743

Commit 096a5743 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

parents 76f402e6 adfeeb28

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/Mods/SecExp/js/buildingsJS.js 2 additions, 2 deletions

src/Mods/SecExp/js/buildingsJS.js
src/Mods/SecExp/js/secExp.js 3 additions, 4 deletions

src/Mods/SecExp/js/secExp.js
src/Mods/SecExp/js/secExpBC.js 11 additions, 23 deletions

src/Mods/SecExp/js/secExpBC.js
src/Mods/SecExp/widgets/miscSecExpWidgets.tw 0 additions, 3 deletions

src/Mods/SecExp/widgets/miscSecExpWidgets.tw
src/events/scheduled/murderAttempt.js 2 additions, 2 deletions

src/events/scheduled/murderAttempt.js
src/gui/theming.js 26 additions, 43 deletions

src/gui/theming.js
src/gui/tooltips.js 10 additions, 4 deletions

src/gui/tooltips.js
src/js/utilsFC.js 8 additions, 7 deletions

src/js/utilsFC.js
themes/themes.md 5 additions, 1 deletion

themes/themes.md

with 67 additions and 89 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