chiark / gitweb /
Fix confict
authorDaid <daid303@gmail.com>
Mon, 2 Apr 2012 17:39:36 +0000 (19:39 +0200)
committerDaid <daid303@gmail.com>
Mon, 2 Apr 2012 17:39:36 +0000 (19:39 +0200)
commit2595e57d5abf6c2052072d77848cc75f88bca3bc
tree2bd26c24d3d58c99d4a87f4f25c58882e3c9baa0
parent6d82dfb4bd2e3e75f05b9d73786241ae765903d2
parenta8963b1cc1e96e16c2fcec2fc433df98863a41a3
Fix confict
Cura/gui/printWindow.py