Virgil Dupras 46f8984bdc Merge branch 'qt5' into develop ...

Conflicts:
	README.md
	qtlib/about_box.py
	qtlib/reg.py
	qtlib/reg_demo_dialog.py
	qtlib/reg_submit_dialog.py

2013-12-07 19:49:27 -05:00

1.6 KiB

Raw Blame History

View Raw