Conflicts: ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java All of these were 'self-resolved' when kdiff3 invoked Former-commit-id: |
||
---|---|---|
.. | ||
.settings | ||
cherrypy | ||
dynamicserialize | ||
h5py | ||
java-importer | ||
matplotlib | ||
nose | ||
numpy | ||
pil | ||
pmw | ||
pupynere | ||
pycairo | ||
pygtk | ||
pypies | ||
qpid | ||
scientific | ||
scipy | ||
setuptools | ||
tables | ||
thrift | ||
tpg | ||
ufpy | ||
werkzeug | ||
.project | ||
.pydevproject | ||
pythonPackages.ecl | ||
README | ||
VERSIONS |
The python packages dir exists solely for pure python packages. NO JAVA/JEP CODE ALLOWED. Each dir under this directory should be able to be copied to an installed python's site-packages dir and function correctly, being able to be imported and used as needed.