root
|
0eb9520e15
|
Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]
Former-commit-id: 5a453ee984
Former-commit-id: 537dbadf64 [formerly 8a66b2f209]
Former-commit-id: 1792158ef8
|
2012-08-15 22:15:20 +00:00 |
|
Bryan Kowal
|
a6d1f97dec
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9361f3eb94 [formerly f528e10391] [formerly 9361f3eb94 [formerly f528e10391] [formerly f0e3b957e3 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]
Former-commit-id: f0e3b957e3
Former-commit-id: 21e8618852 [formerly 1ee59eac71]
Former-commit-id: cbc8964e5b
|
2012-06-18 11:16:28 -05:00 |
|
Max Schenkelberg
|
5729c0acc5
|
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 06ee0bbf6f [formerly 78e1bd2c62] [formerly 06ee0bbf6f [formerly 78e1bd2c62] [formerly 1f5abc6e20 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]]]
Former-commit-id: 1f5abc6e20
Former-commit-id: 2db836b296 [formerly 3ca8ca6f01]
Former-commit-id: 6cd18a09dc
|
2012-05-09 15:02:30 -05:00 |
|
Steve Harris
|
d040b14742
|
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: d7f7c26582 [formerly 092efd6072] [formerly d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 53d2822329 [formerly 98447412f8]
Former-commit-id: 7ee04eb560
|
2012-05-09 13:19:47 -05:00 |
|
Steve Harris
|
1d2ad9224a
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 572e1bb476 [formerly 27bc369818] [formerly 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda [formerly 63ea8599d7]
Former-commit-id: 7978d3b640
|
2012-05-09 13:14:00 -05:00 |
|
Richard Peter
|
83564a4dde
|
Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: c33a392a8c [formerly 349adaeedd] [formerly c33a392a8c [formerly 349adaeedd] [formerly b11df888d3 [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]]
Former-commit-id: b11df888d3
Former-commit-id: ae35c2f27c [formerly e3323febc5]
Former-commit-id: 0212d3108f
|
2012-04-27 12:08:29 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Max Schenkelberg
|
96a6f4f647
|
Issue #239 Added wireframe shape capability
Former-commit-id: 7900e78944 [formerly 12dcb4b044] [formerly 7900e78944 [formerly 12dcb4b044] [formerly 5be2b4e745 [formerly f56dd661225103b08b1d51a9f0cb174bd73340eb]]]
Former-commit-id: 5be2b4e745
Former-commit-id: 3e781ede4f [formerly f6a2f5e55c]
Former-commit-id: 12c672e400
|
2012-04-12 14:46:08 -05:00 |
|
Max Schenkelberg
|
5b50c04d63
|
Issue #239 Start of remote target capabilities
Former-commit-id: ac1fc79f5b [formerly 6c411ffb07] [formerly ac1fc79f5b [formerly 6c411ffb07] [formerly d2d03e2c64 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]]
Former-commit-id: d2d03e2c64
Former-commit-id: 3b9699d896 [formerly 5d7e504e89]
Former-commit-id: 522382bb0b
|
2012-04-03 15:11:20 -05:00 |
|
Nate Jensen
|
28931de3c6
|
Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: 37d4401747 [formerly 615962f5dd] [formerly 37d4401747 [formerly 615962f5dd] [formerly 0e214bcd7c [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 8d94771854 [formerly 2801c4fdfb]
Former-commit-id: 98fb91164b
|
2012-03-22 09:39:59 -05:00 |
|
Matt Nash
|
bcc32c10bc
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
|
2012-01-19 11:53:12 -06:00 |
|
root
|
e2ecdcfe33
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
|
2012-01-06 08:55:05 -06:00 |
|