merge

artTools/vector_layer_split.py

compile

compile-git

compile.bat

compile_debug+sanityCheck.bat

devNotes/VersionChangeLog-Premod+LoliMod.txt

sanityCheck

slave variables documentation - Pregmod.txt

src/SecExp/attackHandler.tw

src/facilities/farmyard/farmerSelectWorkaround.tw

src/facilities/farmyard/food/foodMarket.tw

src/facilities/farmyard/food/pFoodCrisis.tw

src/facilities/farmyard/futureAnimals.tw

src/facilities/farmyard/saWorkTheFarm.tw

src/facilities/nursery/childInteract.tw

src/facilities/nursery/nursery.tw

src/facilities/nursery/previousChildInLine.tw

src/gui/Encyclopedia/encyclopedia.tw

src/js/economyJS.js

src/js/food.js