Merge branch 'master' into bookmarks
authorBartosz Szatkowski <bulislaw@linux.com>
Mon, 16 Aug 2010 10:19:45 +0000 (12:19 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Mon, 16 Aug 2010 10:19:45 +0000 (12:19 +0200)
commit2a1e7556e2b86ade2532b0bd79bbeef92c865770
tree7f75babdff510fd21855e390ac4a1578c2515ae0
parentb100dc9e8af68064caea950bae1249b1e702769c
parentc8dac6f49192f4152c642464515d5f06d99ce9d2
Merge branch 'master' into bookmarks
trunk/src/plugins/xdxf/src/src.pro