2011/3/30 John Scipione <jscipione@xxxxxxxxx>: > I did a bunch of style changes to Deskbar that got committed by tqh a few > weeks ago. Depending on how old the branch is this might cause some problems > at merge time. Unfortunately since the license broke the 80 char per line > limit almost every file was altered at least a little bit. Otherwise there > shouldn't be an issue. We already got an ok for this in the bug otherwise it wouldn't have been commited. /Fredrik Holmqvist, TQH