Fix UID after conflict resolution 52/12952/1
authorBruno JOFRET <bruno.jofret@scilab-enterprises.com>
Fri, 18 Oct 2013 09:48:40 +0000 (11:48 +0200)
committerBruno JOFRET <bruno.jofret@scilab-enterprises.com>
Fri, 18 Oct 2013 09:48:40 +0000 (11:48 +0200)
commit6fc8becfa97be282b7fe1ccbcec457a7453d14e4
tree64d8d32ee6050da2443bb4d1548866d5e6869015
parent38ffd793f73bf45705ba523980b20f97328c0bf8
Fix UID after conflict resolution

Change-Id: Ie05b9de3248d56f20ecc1b1352414b27279edfd9
scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java