Micah Lee 79ea7c8890

Merge branch 'master' of https://github.com/NaruTrey/torbrowser-launcher into NaruTrey-master ...

Conflicts:
	share/torbrowser-launcher/locale/en/messages.pot
	share/torbrowser-launcher/locale/nl_NL/messages.pot

2017-01-26 20:32:58 -08:00

..

appdata

renaming torbrowser-launcher.appdata.xml to torbrowser.appdata.xml because the .desktop is torbrowser.desktop

2014-11-25 13:49:30 -08:00

applications

translate: Translated menu items in torbrowser-settings.desktop

2016-12-03 20:51:19 +04:00

pixmaps

Make icon a png instead of xpm (fixes #226)

2016-03-04 15:15:44 +01:00

torbrowser-launcher

Merge branch 'master' of https://github.com/NaruTrey/torbrowser-launcher into NaruTrey-master

2017-01-26 20:32:58 -08:00