Leon Richardt b6f632701f Fix merge conflicts

2019-09-08 22:58:17 +02:00

..

common

Normalize line endings in already existing files

2019-09-08 22:27:57 +02:00

debug

Normalize line endings in already existing files

2019-09-08 22:27:57 +02:00

singletons

Fixed stuff in user popup

2019-09-01 13:06:56 +02:00

util

Normalize line endings in already existing files

2019-09-08 22:27:57 +02:00

widgets

Fix merge conflicts

2019-09-08 22:58:17 +02:00

BaseSettings.cpp

Normalize line endings in already existing files

2019-09-08 22:27:57 +02:00

BaseSettings.hpp

Normalize line endings in already existing files

2019-09-08 22:27:57 +02:00

BaseTheme.cpp

Normalize line endings in already existing files

2019-09-08 22:27:57 +02:00

BaseTheme.hpp

Normalize line endings in already existing files

2019-09-08 22:27:57 +02:00

main.cpp

Normalize line endings in already existing files

2019-09-08 22:27:57 +02:00

main.pro

Normalize line endings in already existing files

2019-09-08 22:27:57 +02:00