Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator.git into 2.1
authorloaden <loaden@gmail.com>
Fri, 7 Jan 2011 03:48:59 +0000 (11:48 +0800)
committerloaden <loaden@gmail.com>
Fri, 7 Jan 2011 03:48:59 +0000 (11:48 +0800)
commitff355e08cfeefe4d171883426adf7a5ad536a561
tree100ace1f25155ca3c6b980c6269fdb819a834535
parent77c2ddc386d2eff0d3dfc9da46841ff5e716cc2d
parentffd1de7c8bb50c47df982a73e1dea54f7813f0d9
Merge branch '2.1' of git://gitorious.org/qt-creator/qt-creator.git into 2.1