Merge branch 'fix/high-dpi'
authorDaniel Carl <danielcarl@gmx.de>
Wed, 2 Apr 2014 21:59:35 +0000 (23:59 +0200)
committerDaniel Carl <danielcarl@gmx.de>
Wed, 2 Apr 2014 21:59:35 +0000 (23:59 +0200)
commit2f71d8c877daf50d0c7e3c02bbd971f4978c758d
treec2fd3855bac1d828c1c38ae75191e9cc00cc258f
parentcdd1aec506ffd7089b8c708e0b8ecac9e4769a85
parentbe4b702d181a20ee857502925235fe8cfbc5227c
Merge branch 'fix/high-dpi'

Conflicts:
src/config.def.h
src/config.def.h
src/main.c
src/main.h
src/normal.c