fixed conflicts with master
authorMax Usachev <maxusachev@gmail.com>
Tue, 22 Jun 2010 12:19:02 +0000 (15:19 +0300)
committerMax Usachev <maxusachev@gmail.com>
Tue, 22 Jun 2010 12:19:02 +0000 (15:19 +0300)
commit3ad1b9aa9e5af7ee5e439d8018ce3c7f36d796b5
treef4f7b96c913847770d7ecaac191834e47694929d
parent38fd4d53ac38a3518639c4e5dc8c76a4ce345f79
parent2fe763e57092352e2d29fcb7de4f42d6332715d2
fixed conflicts with master
controller.py
database/SQLite.py