Jonathan White aba4fa94be Merge remote-tracking branch 'keepassx/master' ...

# Conflicts:
#	README.md
#	share/translations/keepassx_de.ts
#	src/CMakeLists.txt
#	src/gui/MainWindow.h

2016-02-27 19:11:09 -05:00

..

icons

Add KeePass 2 document icons.

2014-01-18 23:35:34 +01:00

linux

Use a better GenericName

2015-07-16 23:07:21 +02:00

macosx

Improve the application icon.

2013-03-24 11:40:18 +01:00

translations

Merge remote-tracking branch 'keepassx/master'

2016-02-27 19:11:09 -05:00

windows

Improve the application icon.

2013-03-24 11:40:18 +01:00

CMakeLists.txt

Install desktop file and icons to DATADIR instead of the hardcoded share/.

2015-04-14 23:23:14 +02:00