awips2/nativeLib/.project

12 lines
202 B
Text
Raw Normal View History

Merge branch 'ss_builds' (12.12.1-12) into development 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: d27c5237c38ef43cb3a64854c9d807cb2cefc33b [formerly 4d4771ee3a341346abbbc45d3cdcb1c9b0302a65] [formerly 43ddfe98c431790b1980ef60e2aa02c644e4048c] [formerly d27c5237c38ef43cb3a64854c9d807cb2cefc33b [formerly 4d4771ee3a341346abbbc45d3cdcb1c9b0302a65] [formerly 43ddfe98c431790b1980ef60e2aa02c644e4048c] [formerly f6988eefff0607b51df140edd0fee2c307f7a15f [formerly 43ddfe98c431790b1980ef60e2aa02c644e4048c [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]] Former-commit-id: f6988eefff0607b51df140edd0fee2c307f7a15f Former-commit-id: 377804398bb1f54bc5c8529c6a43bfa9d3dbf320 [formerly f02c1ef71d064f9fb66fc7e595f6b4f54a2b457c] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d53a3c4ac075c44e4e1c3f02dbb5877]] Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4678f9c8902d632ad2f968900c3a718] Former-commit-id: b0a60923c45256826b80b5117a92fcd463ea3463
2012-12-06 11:25:49 -06:00
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>nativeLib</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>