fixed conflicts test1
authortanya <tanyshk@gmail.com>
Mon, 21 Jun 2010 13:49:58 +0000 (16:49 +0300)
committertanya <tanyshk@gmail.com>
Mon, 21 Jun 2010 13:49:58 +0000 (16:49 +0300)
commitf7f6ed680538807c31adf2838d3bb6bd8568639d
tree64a14ff9540653eed8511f7051943e4e31125f11
parent6fb7d5e17e25aabac654eb1fb07bc40c9eeb63aa
parent79660ba7ff6dc8c6970e084278050cd519130af0
fixed conflicts
controller.py
ui/hildon_ui.py
ui/hildon_ui.pyo