179755f156
Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java Former-commit-id:d27c5237c3[formerly4d4771ee3a] [formerly43ddfe98c4] [formerlyd27c5237c3[formerly4d4771ee3a] [formerly43ddfe98c4] [formerlyf6988eefff[formerly43ddfe98c4[formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]] Former-commit-id:f6988eefffFormer-commit-id:377804398b[formerlyf02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly6287b32e7d]] Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerlyebcc9975c4] Former-commit-id:b0a60923c4
11 lines
202 B
XML
11 lines
202 B
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<projectDescription>
|
|
<name>nativeLib</name>
|
|
<comment></comment>
|
|
<projects>
|
|
</projects>
|
|
<buildSpec>
|
|
</buildSpec>
|
|
<natures>
|
|
</natures>
|
|
</projectDescription>
|