commit 123eeafba7561bf44e8b66927386a6a5dd11b549
Merge: 1b53d785 0e83eb0e
Author:     Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Mon Sep 21 07:47:21 2015 +0200
Commit:     Fabian Greffrath <fabian@greffrath.com>
CommitDate: Mon Sep 21 07:47:21 2015 +0200

    Merge branch 'master' into sdl2-branch

 src/setup/mouse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)