Zuhayr b47d91b612 Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

..

login.dm

…

logout.dm

…

new_player.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

poll.dm

…

preferences_setup.dm

Fixes #5691

2014-07-26 13:41:43 +03:00

skill.dm

space law -> Corporate regs in skills

2014-07-13 13:47:07 -07:00

sprite_accessories.dm

Adds new hair.

2014-08-13 20:15:07 -05:00