Jeremy Borgman 72f52ac3ed Fixed merge conflicts

2020-09-09 19:58:32 -05:00

..

cli

added translation for CLI --help output (#839)

2020-09-07 07:28:43 -05:00

config

Fixed merge conflicts

2020-09-09 19:58:32 -05:00

core

Changed menu item to match window title

2020-09-08 11:30:44 -05:00

tools

Made undo tool aware of circle count to decrement. Refactored tool ID's to be enum

2020-09-08 11:36:30 -05:00

utils

Fixed merge conflicts

2020-09-09 19:58:32 -05:00

widgets

Fix count when the redo tool is called with circle counter

2020-09-08 20:26:52 -05:00

CMakeLists.txt

Merged various translation PRs and regenerated ts files

2020-09-09 19:23:04 -05:00

imgur.pri

Remove hard-coded Imgur client_id (#253)

2018-06-15 00:14:26 +02:00

main.cpp

Fixed dbus name (#859)

2020-09-07 16:11:32 -05:00