Merge commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:00:11 +0000 (23:00 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 16 Oct 2015 21:00:11 +0000 (23:00 +0200)
commitba94e985a33d8e0feb545b09854e711a331c5343
tree1611316e9a549e742219822c85dc72db7e92eae6
parent53fc900ca0d8964b522149ad959656ab7536a540
parent1f84b008bf2b1eaca473937c48788cb4e4ce1aea
Merge commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea'

* commit '1f84b008bf2b1eaca473937c48788cb4e4ce1aea':
  fate: Move screenpresso to the appropriate screen capture file

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
tests/fate/screen.mak
tests/fate/video.mak