Mirror of Unidata's AWIPS2.
Find a file
Bryan Kowal f02d4b7a0b Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d366e70934
2013-10-31 15:34:46 -05:00
cave Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -05:00
cots Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -05:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -05:00
edexOsgi Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -05:00
javaUtilities Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -05:00
ldm 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things 2013-07-11 13:32:26 -05:00
MHSEmulator Issue #2009: Fix NullPointerException in SocketServer start up. 2013-07-23 13:57:38 -05:00
msi Issue #2423 - Windows Java 7 Updates. Note: AWIPSII.Environment is not an Eclipse plugin project 2013-10-09 13:26:27 -05:00
nativeLib Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -05:00
ncep Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -05:00
ost Issue #2333 Removed more unused fields from satellite record 2013-10-11 16:17:52 -05:00
pythonPackages Merge branch 'omaha_13.5.3' (13.5.2-7) into development 2013-10-01 15:06:34 -05:00
RadarServer Merge branch 'omaha_13.5.1' (13.5.1-8) into development 2013-07-31 12:54:12 -05:00
rpms Merge branch 'omaha_14.1.1' into development_on_RHEL6 2013-10-31 15:34:46 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge "Issue #2476 fixed crash, added short[] numpy support, removed gfe wx/discrete string keys hack, cleaned up jep numpy interfaces and code" into development 2013-10-30 11:28:58 -05:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00