dupeguru/cocoa
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
inter Merge branch 'regless' into develop 2013-12-07 10:19:31 -05:00
me Updated copyright year to 2013. 2013-04-28 10:35:51 -04:00
pe Updated copyright year to 2013. 2013-04-28 10:35:51 -04:00
se Updated copyright year to 2013. 2013-04-28 10:35:51 -04:00
run_template.py Moved run templates from root folder to cocoa/qt subfolders. 2012-08-15 07:33:01 -07:00
waf Replaced dupeGuru XCode project with a WAF build script. 2012-07-28 16:22:51 -04:00
wscript Removed fairware 2013-11-30 17:54:40 -05:00