Merge branch '1.0'
authorMilian Wolff <mail@milianw.de>
Wed, 16 Jun 2010 21:22:30 +0000 (23:22 +0200)
committerMilian Wolff <mail@milianw.de>
Wed, 16 Jun 2010 21:22:30 +0000 (23:22 +0200)
commitc31693d9fc424cb5e6ac7a5527a4078fc4d966e9
treeb06ab67e9cde3bb76008a88a535287ab5c3d82c2
parent44beac0977023c308e5d2b736700cb177080d08a
parent3bd4ae7ffa5f81d847f51a0e53c21cf3fe73d026
Merge branch '1.0'

Conflicts:
shell/kross/examples/bzrkdevelop/kdevbzr.desktop
language/codegen/createclass.cpp
language/codegen/createclass.h
shell/runcontroller.cpp