2 commits

Author	SHA1	Message	Date
Max Schenkelberg	c8e0d2ca98	Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development. ... Change-Id: I37c3135794c991e2405d556823a22768dd491f00 Conflicts: cave/com.raytheon.uf.viz.npp.viirs/src/com/raytheon/uf/viz/npp/viirs/rsc/VIIRSDataCallback.java Former-commit-id: a5994b8983 [formerly be574276f9] [formerly 6d0960c4ef] [formerly b042037a67 [formerly 6d0960c4ef [formerly ed981dc2487d169a502f7396520899fc55ff3299]]] Former-commit-id: b042037a67 Former-commit-id: 79c9f6bf695445a8d8715c158cdad1b211214ced [formerly 1b81c79b13] Former-commit-id: fb1a6e203b	2013-04-04 13:21:35 -05:00
Steve Harris	c9b563338a	12.11.1-4 baseline ... Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]] Former-commit-id: 6958b861f0 Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce] Former-commit-id: 2c82d9cb07	2012-10-16 13:27:07 -05:00