1314976753
Conflicts: cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java edexOsgi/build.edex/edex/allElements.xml edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template rpms/awips2.qpid/0.7/build.sh rpms/awips2.qpid/build.sh Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb Former-commit-id: |
||
|---|---|---|
| .. | ||
| common/cave/etc | ||
| linux | ||
| linux.x86/cave/lib | ||
| linux.x86_64/cave/lib64/lib_illusion | ||
| win32.x86 | ||
| 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.