Merge branch 'master' of git://gitorious.org/veter/cockpit
authorAndrey Nechypurenko <andreynech@gmail.com>
Thu, 2 Jun 2011 20:47:41 +0000 (22:47 +0200)
committerAndrey Nechypurenko <andreynech@gmail.com>
Thu, 2 Jun 2011 20:47:41 +0000 (22:47 +0200)
commit93e36fb94ee1f7beb6b663f3739140417f85cedf
treeb5fdaf27005cc4febd8c53694b5483e92b1c61db
parent25a7d0181dcf22183b2aeb4326e6c78eb975ade6
parent0e2b98b32ddd674dfdfda5bc51ce6c2d224ae8dc
Merge branch 'master' of git://gitorious.org/veter/cockpit

Conflicts:
daeview
src/main.cpp