[Xfce4-commits] libxfce4ui:master Add some debugging information for conflict.

Updating branch refs/heads/master to e5637cc58ae7b44ba0e0ff2cdc797757d23d8f05 (commit) from b56143b76d5e25ac661252d177cb7f598abfde87 (commit) commit e5637cc58ae7b44ba0e0ff2cdc797757d23d8f05 Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Dec 20 23:21:43 2012 +0100 Add

[Xfce4-commits] libxfce4ui:master Add some debugging information for conflict.

Updating branch refs/heads/master to 173f728069b313c4091120a81565bd4ef13fad51 (commit) from f30f9742e64ea5ec3b23d977b904f24799d773d6 (commit) commit 173f728069b313c4091120a81565bd4ef13fad51 Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Dec 20 23:21:43 2012 +0100 Add