chiark / gitweb /
Merge branch 'master' of github.com:daid/Cura
authordaid <daid303@gmail.com>
Mon, 2 Jul 2012 08:11:52 +0000 (10:11 +0200)
committerdaid <daid303@gmail.com>
Mon, 2 Jul 2012 08:11:52 +0000 (10:11 +0200)
commit402c2223ca4d73075562bef30464546b72f2da7b
tree68df80b2c780ab416151255760451733cbb76250
parent14b4a4a542efdc607807f17807eb006368f4cca8
parent1f80cd34cf146474d4f8f5d7a1f62e45f45613d8
Merge branch 'master' of github.com:daid/Cura
Cura/gui/mainWindow.py