Marcus Huderle 532afc5385 Merge remote-tracking branch 'origin/master' into cursors ... # Conflicts: # mainwindow.cpp # mainwindow.h # mainwindow.ui		2018-09-13 16:54:16 -05:00
..
icons	Add reticule-styled cursors	2018-09-12 08:52:24 -05:00
images	add HealLocation fly spots	2018-09-11 20:37:36 -04:00
images.qrc	Add reticule-styled cursors	2018-09-12 08:52:24 -05:00