xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
615 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
Bryan Kowal dfd75b4c72 Merge branch 'ss_sync' (OB12.6.1-10) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	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.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]
Former-commit-id: b87b66abc5
Former-commit-id: 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]
Former-commit-id: b4917e6708
2012-06-27 17:21:48 -05:00
cave Merge branch 'ss_sync' (OB12.6.1-10) into development 2012-06-27 17:21:48 -05:00
cots Merge branch 'ss_sync' (OB12.6.1-10) into development 2012-06-27 17:21:48 -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_sync' (OB12.6.1-10) into development 2012-06-27 17:21:48 -05:00
edexOsgi Merge branch 'ss_sync' (OB12.6.1-10) into development 2012-06-27 17:21:48 -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 12.6.1-10 baseline 2012-06-21 08:58:00 -05:00
ncep Merge branch 'ss_sync' (OB12.6.1-10) into development 2012-06-27 17:21:48 -05:00
pythonPackages Merge branch 'ss_sync' (OB12.6.1-10) into development 2012-06-27 17:21:48 -05:00
RadarServer Revert "12.6.1-10 baseline" 2012-06-21 08:51:08 -05:00
rpms Merge branch 'ss_sync' (OB12.6.1-10) into development 2012-06-27 17:21:48 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tools Issue #708 - execute permissions didn't survive the git push 2012-06-22 12:08:20 -05:00
.gitignore Merge branch 'ss_sync' into 9-Wes2Bridge 2012-02-27 15:58:49 -06:00