Merge branch 'master' into new_panels_with_context_buttons
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 27 Aug 2010 05:29:39 +0000 (08:29 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 27 Aug 2010 05:29:39 +0000 (08:29 +0300)
1  2 
src/src.pro

diff --cc src/src.pro
Simple merge