Commit graph

10 commits

Author SHA1 Message Date
Richard Peter
76f11f00ae Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]
Former-commit-id: 930ff50fb8
Former-commit-id: 81ae3ea8bf
2013-05-21 12:11:21 -05:00
Steve Harris
7e04d8cd13 13.4.1-10 baseline
Former-commit-id: 68fe2134b8 [formerly 9a403b3615] [formerly 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]
Former-commit-id: 92152778b9
Former-commit-id: b1fc4e625b
2013-05-20 10:52:47 -04:00
Max Schenkelberg
5617dfaa67 Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: 2611980ca4 [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]
Former-commit-id: e0ba97d547
Former-commit-id: 6b1426dd34
2013-02-27 11:50:38 -06:00
Steve Harris
f1256f2a9e 13.1.2-7 baseline
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 42189b5f88
Former-commit-id: b7f1dbe72b
2013-01-11 16:12:09 -05:00
Steve Harris
f2102bfb24 12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: c42ae0fa39
Former-commit-id: 9f97182964
2012-07-19 16:20:40 -05:00
Steve Harris
33a67cdd82 12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Steve Harris
a2a6a18fae 12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Roger Ferrel
49dfa99cc5 Issue #181
Added files to index.


Former-commit-id: e3d3629375 [formerly cf1383a412] [formerly beae8e7e59 [formerly 874ae116e412c39b73dc3cc74ee3f3a3b02d82f7]]
Former-commit-id: beae8e7e59
Former-commit-id: e1fc0b48c1
2012-01-26 15:05:25 -06:00
Roger Ferrel
9475b22c54 Issue #181
Changes from January ncep_cave

Former-commit-id: ae0981ac0f [formerly 7427aeaf29] [formerly fa42f2dc60 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]
Former-commit-id: fa42f2dc60
Former-commit-id: 376f6868b6
2012-01-26 09:26:07 -06:00
root
8e80217e59 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00