# HG changeset patch # User Dirk Olmes # Date 1510274736 -3600 # Node ID 8b1678851b54b5b7239f9aae22c20821fd022ba0 # Parent f715378371ab0c53d38e9552b19cc13562299ee9# Parent 39080a271bf37521135f826997086a5103d2468d merge the pyqt5 branch into the default branch