Fix merge conflict
authorMaran <maran.hidskes@gmail.com>
Sat, 16 Mar 2013 20:38:12 +0000 (21:38 +0100)
committerMaran <maran.hidskes@gmail.com>
Sat, 16 Mar 2013 20:38:12 +0000 (21:38 +0100)
commitdfd48319a38dd4d8a8afd874eb55175cd8aad590
treeae211db9138171e197dc2322a4b69781efa5167f
parent1cda13a407eaeff901f7bed289395573b0e5c3d8
parent070d497afbee28b237d2051381b18d264697ca14
Fix merge conflict
.gitignore
gui/gui_classic.py