Commit graph

8 commits

Author SHA1 Message Date
Bryan Kowal
f528e10391 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: 9e117e495d669e310839bc9ff8e1e8207b03491b
2012-06-18 11:16:28 -05:00
Max Schenkelberg
78e1bd2c62 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
Richard Peter
349adaeedd Issue #538: Fix Serialization Annotations and Serialization Issues
Change-Id: I436997106438ab283e987cb7e3055fcee009b608

Former-commit-id: 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0
2012-04-27 12:08:29 -05:00
Max Schenkelberg
12dcb4b044 Issue #239 Added wireframe shape capability
Former-commit-id: f56dd661225103b08b1d51a9f0cb174bd73340eb
2012-04-12 14:46:08 -05:00
Max Schenkelberg
6c411ffb07 Issue #239 Start of remote target capabilities
Former-commit-id: 30b76609cff9a737b8e4190bbfebb5a37a259fad
2012-04-03 15:11:20 -05:00
Nate Jensen
615962f5dd Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: 7a58d8a17be53fc504cafe32d19de2f52121eeff
2012-03-22 09:39:59 -05:00
Matt Nash
66be3bec40 Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
9f19e3f712 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00