Merge remote-tracking branch 'snowleopard/master' into angerman/feature/advanced...
authorMoritz Angermann <moritz.angermann@gmail.com>
Fri, 15 Jan 2016 07:59:02 +0000 (15:59 +0800)
committerMoritz Angermann <moritz.angermann@gmail.com>
Fri, 15 Jan 2016 07:59:02 +0000 (15:59 +0800)
commitee95b14e13491cc42329afed8ae038e9e94527cb
tree561de1c98c9384d95fd820037547e6ea0c97f943
parentade30882bd45c0f4e4747ba9c6d19b2ec08846de
parent20243965783cfb5ba75096ebe375517d63cf37c8
Merge remote-tracking branch 'snowleopard/master' into angerman/feature/advanced-render-box

# Conflicts:
# src/Base.hs
src/Rules/Actions.hs