xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/nativeLib
History
Steve Harris 84d0f1fbb6 Merge branch 'master' (OB12.7.1-8) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpDescriptor.java
	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/FFMPColorUtils.java
	cave/com.raytheon.uf.viz.points/.classpath
	cave/com.raytheon.uf.viz.points/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicMaxValImageExtension.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/msgs/IGridHistoryUpdatedListener.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/DbParm.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridVectorResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/FloodReportDlg.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
	deltaScripts/.pydevproject
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/esb/data/utility/common_static/base/warngen/severeWeatherStatement.vm
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.climo/.classpath
	edexOsgi/com.raytheon.uf.common.climo/.project
	edexOsgi/com.raytheon.uf.common.climo/com.raytheon.uf.common.climo.ecl
	edexOsgi/com.raytheon.uf.common.climo/src/com/raytheon/uf/common/climo/IClimoQuery.java
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPCacheRecord.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/Interpolation.java
	edexOsgi/com.raytheon.uf.common.hlstopo/.classpath
	edexOsgi/com.raytheon.uf.common.hlstopo/.project
	edexOsgi/com.raytheon.uf.common.hlstopo/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.common.hlstopo/com.raytheon.uf.common.hlstopo.ecl
	edexOsgi/com.raytheon.uf.common.hlstopo/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.common.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	edexOsgi/com.raytheon.uf.edex.tafqueue/.classpath
	edexOsgi/com.raytheon.uf.edex.tafqueue/.project
	edexOsgi/com.raytheon.uf.edex.tafqueue/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.edex.tafqueue/com.raytheon.uf.edex.tafqueue.ecl
	edexOsgi/com.raytheon.uf.edex.tafqueue/component-deploy.xml
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	edexOsgi/gov.noaa.nws.ost.edex.plugin.regionalsat/component-deploy.xml
	nativeLib/rary.cots.jasper/jasper-1.900.1/ChangeLog
	nativeLib/rary.cots.jasper/jasper-1.900.1/src/appl/dummy.c
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.classpath
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.project
	ost/gov.noaa.nws.ost.edex.plugin.regionalsat/.settings/org.eclipse.jdt.core.prefs
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.gfe/component.spec
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.core/Installer.localapps-environment/scripts/profile.d/awips2Localapps.sh
	rpms/awips2.core/Installer.rcm/scripts/conf/start-config
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/release/buildCoreRPMs.sh
	rpms/common/yum/arch.x86/comps.xml
	tools/devAutoDeploy/devAutoDeploy.ecl

Former-commit-id: 07c40a9c0c [formerly 56249c2611] [formerly 07c40a9c0c [formerly 56249c2611] [formerly 587bb6a274 [formerly b866ca00a3bbfc7edd9e941bd5f84699fc21b255]]]
Former-commit-id: 587bb6a274
Former-commit-id: 9e4df42326 [formerly 2aa4114e4d]
Former-commit-id: d7540c958f
2012-07-27 14:44:44 -05:00
..
build.native Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development 2012-07-10 16:57:16 -05:00
build.ohd 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.nativelib.cimport 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.nativelib.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
dist.native Merge branch 'master' (OB12.7.1-8) into development 2012-07-27 14:44:44 -05:00
docs.native 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
docs.ohd 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edex_com 12.5.1-2 baseline 2012-05-03 19:17:13 -05:00
edex_notify 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edex_pdc 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edexBridge 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gridslice 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ncep_grib2module Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development 2012-07-10 16:57:16 -05:00
ohd.bias_trans 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.common 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.damcrest 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.damcrestdb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.db 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.dimensions_file_uploader 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.fcstservice 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.ihfsdb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.lib 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.map 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.misc_dialogs 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.mpe 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.pdc_pp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.prism 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.rax_apps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.raxdb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.rivermonitor 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.sshp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.swttable 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.sys_monitor 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.tsl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.var 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.qpid 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.thrift 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.cots.ant-contrib 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.cots.gfortran 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.cots.hdf5 Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
rary.cots.jasper Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development 2012-07-10 16:57:16 -05:00
rary.cots.java 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.cots.jepp 12.5.1-2 baseline 2012-05-03 19:17:13 -05:00
rary.cots.jna 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.cots.postgresql 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.empty 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.empty.motif 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.meteorological 12.5.1-2 baseline 2012-05-03 19:17:13 -05:00
rary.ohd.calb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.ffg 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.filesystem 12.7.1-8 baseline 2012-07-19 16:20:40 -05:00
rary.ohd.ifp Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10 2012-07-10 09:29:33 -05:00
rary.ohd.ofs 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.ofs.db 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.ofs.shared 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.ofs.shefpars.driv 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.pproc 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.pproc.gribit 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.pproc.util 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.util 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.ohd.whfs Issue #817 - replacing files that were somehow lost between 12.6.1-9 and 12.6.1-10 2012-07-10 09:29:33 -05:00
rary.wfoapi.common 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.consoleUser 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.getTestMode 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.MonitorTestMode 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.showBanner 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.temp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.test_WorkstationTestMode 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.tmb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.tmb_exit 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.tmbRemoteCheck 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
rary.wfoapi.tmcp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
runy.cots.flex 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
runy.runso 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
tool.cdbgen 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
tool.gluegen 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
nativeLib.ecl 12.7.1-8 baseline 2012-07-19 16:20:40 -05:00