Steve Harris
|
5e0e2d2c48
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]
Former-commit-id: d325d496f5
Former-commit-id: 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]
Former-commit-id: 23c34c469a
|
2012-06-11 15:24:03 -05:00 |
|
Steve Harris
|
1f521a70b3
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]
Former-commit-id: 97c4db937e
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
fe7ac96625
|
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
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: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]
Former-commit-id: 53d2822329
|
2012-05-09 13:19:47 -05:00 |
|
Dave Hladky
|
9ae2445f9f
|
Issue #15 Re-wrote SimDate integration for menus, alert observers after
merge headache.
Former-commit-id: 37da8763eb [formerly 42a12fa7a5] [formerly 1b7473572f] [formerly 5b7ecea866 [formerly 1b7473572f [formerly 647b7ac154dbdaf945231b231f491bbca86d2a24]]]
Former-commit-id: 5b7ecea866
Former-commit-id: d98bc5d5887a016d68a6737704a6fb5e552d838c [formerly 61e31c62ff]
Former-commit-id: a1a3a361dd
|
2012-04-30 13:43:34 -05:00 |
|
Steve Harris
|
98d8b3f188
|
12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
|
2012-04-18 15:18:16 -05:00 |
|
David Gillingham
|
f2b58b2f16
|
Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]
Former-commit-id: b056e18757
Former-commit-id: 589441ef8a8b0e931380208ea6dea9adff2ba461 [formerly 87b15de88b]
Former-commit-id: ea7a55ad8d
|
2012-01-26 17:38:43 -06:00 |
|
Dave Hladky
|
36d48978af
|
Issue #15 Wes2Bridge time settings
Former-commit-id: bf2470f405 [formerly 66fbee3e04] [formerly 594412a5b5] [formerly b03b324ead [formerly 594412a5b5 [formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]]
Former-commit-id: b03b324ead
Former-commit-id: 2479f0c7510c79fa38a277d7f43ba5ff441b9d5a [formerly 2d53cfbe41]
Former-commit-id: 4e8acfaba3
|
2012-01-25 10:53:51 -06:00 |
|
Matt Nash
|
fa4cd88c90
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
|
2012-01-19 11:53:12 -06:00 |
|
root
|
9bb8decbcf
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
|
2012-01-06 08:55:05 -06:00 |
|