Merge branch 'bug/addcustomlaunchdesktopparams' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 27 Feb 2015 17:01:25 +0000 (17:01 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 27 Feb 2015 17:01:25 +0000 (17:01 +0000)
commit27ff898c1881430653df81a8f0ff218cd2052f7a
tree7821000eec01192df3bbc934b07d50c1b76cb489
parent1718e104b60584336348531e51c8121d69ff6416
parentbe170b5c092fdb42a0275ca4d71051917b21650b
Merge branch 'bug/addcustomlaunchdesktopparams' into develop