Merge branch 'google'
authorBartosz Szatkowski <bulislaw@linux.com>
Fri, 27 Aug 2010 08:30:52 +0000 (10:30 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Fri, 27 Aug 2010 08:30:52 +0000 (10:30 +0200)
commit7ac9dc1a8814dec056146dffbde78d46da75a74c
tree844b1e1fd3c228f5dbe7f476ed2be24b1b431704
parentf12be1b3b8006eb2b2cb44953e59f30700650749
parentdd9dd83d05302dbeaedb479ebcdcaaa4668566bd
Merge branch 'google'
trunk/src/plugins/xdxf/src/XdxfLoadDialog.h