AGulev 4ead8d9d42 Merge remote-tracking branch 'upstream/master' ...

# Conflicts:
#	monarch/monarch.lua

2017-11-27 10:57:32 +03:00

..

transitions

scale_in and scale_out transactions

2017-11-03 10:24:37 +03:00

monarch.lua

Merge remote-tracking branch 'upstream/master'

2017-11-27 10:57:32 +03:00

screen.script

replace hashes with constants

2017-11-03 09:50:28 +03:00