Conflicts: RadarServer/com.raytheon.rcm.feature/feature.xml cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml edexOsgi/build.edex/build.xml edexOsgi/build.edex/esb/conf/log4j-ingest.xml edexOsgi/build.edex/esb/conf/modes.xml edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.text/META-INF/MANIFEST.MF edexOsgi/com.raytheon.uf.common.base.feature/feature.xml edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/FileUtil.java ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java Change-Id: I6abe6f71ed2a5e641c82274944f1aedb676772f9 Former-commit-id: |
||
---|---|---|
.. | ||
common/cave/etc/ncep | ||
linux | ||
linux.x86/cave/lib | ||
linux.x86_64/cave/lib64/lib_illusion | ||
win32.x86/cave/lib | ||
README.txt |
-----README----- The static directory contains common scripts and other files that need to be installed with CAVE. These files generally are not used by a specific component unless the component is "common" and they do not need to be compiled. The following common directories exist within the static directory: common - these files should be installed on every Operating System for every architecture. linux - these files should be installed on every LINUX Operating System for every architecture. We also have the following os / architecture specific directories within the static directory. The name of the directories is based on the eclipse (3.6.1) os.arch designation. linux.x86 - these files will only be installed on a 32-bit Linux Operating System. linux.x86_64 - these files will only be installed on a 64-bit Linux Operating System. win32.x86 - these files will only be installed on a 32-bit MS Windows Operating System. macosx.x86 - these files will only be installed on a 32-bit Apple OS X Operating System.