xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
691 commits 31 branches 40 tags 3.8 GiB
Java 75.8%
Python 18%
HTML 4.5%
Shell 1.3%
PLpgSQL 0.1%
Find a file
Steve Harris 51e38ca887 Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: 1b17cebeb85f871d950bd02e27141b11d977c3ad
2012-08-01 12:43:12 -05:00
cave Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 2012-08-01 12:43:12 -05:00
cots Merge branch 'master' (OB12.7.1-8) into development 2012-07-27 14:44:44 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 2012-08-01 12:43:12 -05:00
edexOsgi Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 2012-08-01 12:43:12 -05:00
javaUtilities Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository. 2012-06-19 13:33:01 -05:00
ldm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Revert "12.6.1-10 baseline" 2012-06-21 08:51:08 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
nativeLib Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 2012-08-01 12:43:12 -05:00
ncep Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 2012-08-01 12:43:12 -05:00
ost Issue #798 - Code review changes 2012-07-31 13:38:23 -05:00
pythonPackages Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 2012-08-01 12:43:12 -05:00
RadarServer Issue #913 - fixed the paths for Radar Server. 2012-07-18 11:12:09 -05:00
rpms Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 2012-08-01 12:43:12 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tools Merge branch 'master' (OB12.7.1-8) into development 2012-07-27 14:44:44 -05:00
.gitignore Merge branch 'ss_sync' into 9-Wes2Bridge 2012-02-27 15:58:49 -06:00