1
0
mirror of https://github.com/arsenetar/dupeguru.git synced 2024-11-13 02:59:02 +00:00
dupeguru/qt
Virgil Dupras 418acf6e5e Merge branch 'regless' into develop
Conflicts:
	cocoa/inter/app.py
	core/app.py
	hscommon/reg.py
	locale/cs/LC_MESSAGES/ui.po
	locale/de/LC_MESSAGES/ui.po
	locale/fr/LC_MESSAGES/ui.po
	locale/hy/LC_MESSAGES/ui.po
	locale/it/LC_MESSAGES/ui.po
	locale/pt_BR/LC_MESSAGES/ui.po
	locale/ru/LC_MESSAGES/ui.po
	locale/ui.pot
	locale/uk/LC_MESSAGES/ui.po
	locale/vi/LC_MESSAGES/ui.po
	locale/zh_CN/LC_MESSAGES/ui.po
	qt/base/app.py
2013-12-07 10:19:31 -05:00
..
base Merge branch 'regless' into develop 2013-12-07 10:19:31 -05:00
me Fixed 32bit Windows packaging for Python 3.3 2013-08-17 14:48:36 -04:00
pe Eased "Clear Picture Cache" triggering under Qt 2013-08-25 10:47:10 -04:00
se Fixed 32bit Windows packaging for Python 3.3 2013-08-17 14:48:36 -04:00
__init__.py Removed .ui files and made the UI setup "by hand". ui files cause more problems than they solve (UI designer is limited in what it can do). 2010-10-04 15:29:00 +02:00
ABOUT_LICENSE Tranformed PyQt's license warning into a licensing note 2010-11-13 14:37:20 +01:00
run_template.py Removed fairware 2013-11-30 17:54:40 -05:00
testapp.py Updated copyright year to 2013. 2013-04-28 10:35:51 -04:00