Steven Howard 01b0cb3372 Merge branch 'houses-bugs' of https://bitbucket.org/lorenc/cnr into houses-bugs ... # Conflicts: # gamemodes/irresistible/cnr/features/houses/house.pwn		2018-09-13 09:54:45 +01:00
..
irresistible	Merge branch 'houses-bugs' of https://bitbucket.org/lorenc/cnr into houses-bugs	2018-09-13 09:54:45 +01:00
COD8.pwn	vacation	2017-01-06 02:15:54 +11:00
sf-cnr.pwn	chuffsec module can be commented to disable now	2018-09-11 18:17:37 +10:00