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

f26a534e

Commit f26a534e authored 6 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'pregmod-master' into 'pregmod-master'

"can not" -> "cannot"   - finish off the other anon's work

See merge request !1785

parents 2b3034e1 2e996ee5

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

devTools/spell_check.txt 1 addition, 0 deletions

devTools/spell_check.txt
src/events/intro/introSummary.tw 2 additions, 2 deletions

src/events/intro/introSummary.tw
src/gui/Encyclopedia/encyclopedia.tw 1 addition, 1 deletion

src/gui/Encyclopedia/encyclopedia.tw
src/npc/fKiss.tw 1 addition, 1 deletion

src/npc/fKiss.tw
src/pregmod/theBlackMarket.tw 6 additions, 6 deletions

src/pregmod/theBlackMarket.tw
src/uncategorized/RESS.tw 1 addition, 1 deletion

src/uncategorized/RESS.tw
src/uncategorized/dispensary.tw 2 additions, 2 deletions

src/uncategorized/dispensary.tw
src/uncategorized/saDiet.tw 1 addition, 1 deletion

src/uncategorized/saDiet.tw
src/uncategorized/saLongTermEffects.tw 1 addition, 1 deletion

src/uncategorized/saLongTermEffects.tw
src/utility/descriptionWidgetsFlesh.tw 9 additions, 9 deletions

src/utility/descriptionWidgetsFlesh.tw

with 25 additions and 24 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