forked from qt-creator/qt-creator
Conflicts: src/plugins/remotelinux/linuxdevice.cpp Change-Id: Iad28a1bfa4632922931d351d2fe27757cf21dec3
27 KiB
27 KiB
Conflicts: src/plugins/remotelinux/linuxdevice.cpp Change-Id: Iad28a1bfa4632922931d351d2fe27757cf21dec3