Arjen Hiemstra f92f0c52c6 Another stray conflict marker

2016-07-13 14:33:42 +02:00

..

__init__.py

Bump API version of plugins that do not need extra porting

2016-05-30 15:29:10 +02:00

ChangeLog.py

Fix showing changelog when the first item in the changelog doesn't start with an "*"

2016-05-23 11:35:01 +02:00

ChangeLog.qml

Add width, height in addition to minimumWidth, minumumHeight to fix retina issue on OSX

2016-04-12 10:23:43 +02:00

ChangeLog.txt

Another stray conflict marker

2016-07-13 14:33:42 +02:00