Max Schenkelberg
1f5abc6e20
Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
...
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056
Former-commit-id: 6c456c0bad00aaa1fea67f90a4633b3e14a78495
2012-05-09 15:02:30 -05:00
Steve Harris
31b3e87ffa
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: f98354aae305ad227eaf3b36e4393b8aefc80f02
2012-05-09 13:19:47 -05:00
Steve Harris
58037cb5d1
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: 8f71c807be1d604cea51ab522f04f8bbf8c11f83
2012-05-09 13:14:00 -05:00
Richard Peter
b11df888d3
Issue #538 : Fix Serialization Annotations and Serialization Issues
...
Change-Id: I436997106438ab283e987cb7e3055fcee009b608
Former-commit-id: 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0
2012-04-27 12:08:29 -05:00
Steve Harris
2a216f333c
12.4.1-4 baseline
...
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Max Schenkelberg
5be2b4e745
Issue #239 Added wireframe shape capability
...
Former-commit-id: f56dd661225103b08b1d51a9f0cb174bd73340eb
2012-04-12 14:46:08 -05:00
Max Schenkelberg
d2d03e2c64
Issue #239 Start of remote target capabilities
...
Former-commit-id: 30b76609cff9a737b8e4190bbfebb5a37a259fad
2012-04-03 15:11:20 -05:00
Nate Jensen
0e214bcd7c
Issue #427 Share maps and editor
...
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: 7a58d8a17be53fc504cafe32d19de2f52121eeff
2012-03-22 09:39:59 -05:00
Matt Nash
c83e5ff474
Moving 12.1.1 into ss_sync
...
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
06a8b51d6d
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00
