Commit graph

16 commits

Author SHA1 Message Date
Steve Harris
16c8aea8ab Omaha #5229 - Another curly brace problem. I really should get a compiler.
Former-commit-id: db91169953c0089567d9a0b78566765483ac582c
2016-04-01 13:21:37 -05:00
Steve Harris
5024bdf13d Omaha #5229 - rearrangements for merge fix
Former-commit-id: c8005c68c65ada701113e5b5f5c5ee70371a1cd1
2016-04-01 12:58:49 -05:00
Steve Harris
7e54629216 Omaha #5229 - Added missing line for merge fix
Former-commit-id: b628921b8759bd8de066234a38838b36eb594c74
2016-04-01 11:15:38 -05:00
Steve Harris
7622c74e43 Omaha #5229 - Removed curly brace from line 503 as a shot at a merge fix
Change-Id: Ibc38cf8052a7fdef03f9c88008f85b595bd0bb05

Former-commit-id: ee0a6dd6cd6602309aed316fc5bdc41fdff8c7ca
2016-04-01 10:35:43 -05:00
Steve Harris
9b151020b3 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.radarapps.rps/src/com/raytheon/uf/viz/radarapps/rps/RpsListEditorDlg.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java


Former-commit-id: 781bddc3e581ba0f9bdaf7fe5b218fd688dbafeb
2016-03-31 15:04:17 -05:00
David Gillingham
91f0c71c33 Omaha #5511: Rewrite RPS List Editor dialog based on CaveSWTDialog.
Change-Id: I6c8c190fcf41f52a8915ee109a2ceb56de25f0c6

Former-commit-id: 4eba21cfdd12f2cbe05668798d535c3870639b64
2016-03-29 16:38:21 -05:00
Bryan Kowal
d9857932c6 Omaha #5271 - include the time span for products that track time span in minutes.
Former-commit-id: 937126b666ea552cd5c40431d097d68ab83f80c5
2016-01-20 13:45:11 -06:00
David Friedman
e7afb77380 ASM #17944 - RADAR: Radarserver should handle NDM file tdwrElevations.txt properly
Change-Id: Ieff06001a5f13b2b286fb9c1c231f4fc190c4493

Former-commit-id: 17a8ac1fd0695d095d32b2fa6e1978db3ea8cb7d
2015-09-25 18:32:43 +00:00
Nathan Bowler
9aadf29f49 Omaha #4498 Use JAXBManager to marshall/unmarshall. Rename Util to RcmUtil.
Change-Id: I532b4226eb52accee4c538de6082ee352104ca03

Former-commit-id: 1262c762bd83199f6cf5f29a0421eda3362bc5bf
2015-06-10 12:00:02 -04:00
David Lovely
80dc4c85d9 Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02

Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
2015-05-19 10:23:35 -05:00
Nate Jensen
8dbe6abbe4 Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29

Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06:00
Steve Harris
d2a654625f 13.3.1-1 baseline
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
3904c4ccf5 12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
2012-06-08 13:39:48 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -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