260 commits

Author	SHA1	Message	Date
Ben Steffensmeier	160b6a7040	Issue #1804 Remove AlphanumericValues from radar HDF5. ... Former-commit-id: 7b7b708eee [formerly 6c741a9ab3] [formerly 86dffab17d [formerly 2c8170a332994405820a25d9052afd7bc8cbcd3f]] Former-commit-id: 86dffab17d Former-commit-id: dfe8de96f2	2013-03-18 17:16:44 -05:00
Steve Harris	2a26783ba7	Merge branch 'omaha_13.3.1' into development ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]] Former-commit-id: 7fcf9f1cb2 Former-commit-id: 900b9aadde	2013-03-18 16:52:00 -05:00
Dustin Johnson	7adf94e9f6	Issue #1794 Consolidate common filename filters into FilenameFilters class ... Change-Id: I29d7267d79164e005e3c202a23267767c853bf36 Former-commit-id: fff7e7983f [formerly ecb0d2c826] [formerly 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]] Former-commit-id: 43a9f608ef Former-commit-id: 1b82ad0dc4	2013-03-15 11:51:58 -05:00
Dave Hladky	9e97fc9efe	Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 ... Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]] Former-commit-id: 5dc454c7ef Former-commit-id: 160e1594b8	2013-03-13 13:56:33 -05:00
Steve Harris	ed5f1dbab6	13.3.1-7 baseline ... Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]] Former-commit-id: e12ed113ae Former-commit-id: 31c0a97dca	2013-03-13 09:50:28 -05:00
Dustin Johnson	9f81b57ec0	Issue #1784 Update ColorMapParameters import for ncep plugins ... Change-Id: I704f2d98eb07531108593de681a9f7ffc67b04e8 Former-commit-id: a5e0b421b5 [formerly 9cd29d7625] [formerly 0932affd16 [formerly 884757847d855af099219c8ef2715a6319913646]] Former-commit-id: 0932affd16 Former-commit-id: 64d8fc0ea3	2013-03-13 08:45:54 -05:00
Steve Harris	bca46a1354	Merge branch 'omaha_13.3.1' into development ... Conflicts: edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]] Former-commit-id: 0cd7e56e65 Former-commit-id: d5bcdb0015	2013-03-12 16:04:23 -05:00
Dave Hladky	155903d135	Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 ... Conflicts: cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java ncep/com.raytheon.uf.edex.ncep.feature/feature.xml Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227 Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]] Former-commit-id: 4b08491880 Former-commit-id: 6ea95002de	2013-03-12 15:48:34 -05:00
Steve Harris	6fe4b16924	13.3.1-6 baseline ... Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]] Former-commit-id: 566b677d09 Former-commit-id: 4ed21b702b	2013-03-12 08:35:45 -05:00
Ben Steffensmeier	334af0001b	Issue #1532 Delete uf.common.image and clean up the mess it left behind. ... Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]] Former-commit-id: 2ca86633d6 Former-commit-id: 5068b18c6a	2013-02-28 17:00:56 -06:00
Max Schenkelberg	41706c42f2	Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database. ... Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79 Former-commit-id: c8a5f1a007 [formerly 0f1112fb3e] [formerly 38bba3705f [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]] Former-commit-id: 38bba3705f Former-commit-id: 6ebc058df4	2013-02-27 12:26:32 -06: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	e46625f8f2	Merge branch 'development' into omaha_13.3.1 ... Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]] Former-commit-id: 6ec9e73035 Former-commit-id: 0051276ad1	2013-02-25 15:58:48 -06:00
Steve Harris	4f155a183a	Merge branch 'development' into omaha_13.3.1 ... Conflicts: cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]] Former-commit-id: 2641d578e2 Former-commit-id: 33dd2589f1	2013-02-21 15:41:39 -06:00
Bryan Kowal	b2a0a7c148	Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper ... - disabled the startup of the admin web application in the jetty container - removed configuration and libraries specific to the tanuki java service wrapper - updated the rpm build and developer deployment - added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log... Former-commit-id: 519ce2c0fb [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]] Former-commit-id: 803397c7c7 Former-commit-id: 450e8e7a4c	2013-02-21 13:55:28 -06:00
Steve Harris	e4435815c9	13.3.1-1 baseline ... Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]] Former-commit-id: d2a654625f Former-commit-id: 46d28be4a4	2013-02-20 16:19:40 -06:00
Steve Harris	81f1fb83a0	Merge branch 'omaha_13.2.1' (13.2.1-8) into development ... Former-commit-id: c2327ce33d [formerly ea50a5db77] [formerly d123c044c3 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]] Former-commit-id: d123c044c3 Former-commit-id: 1c08acab38	2013-02-19 12:22:00 -06:00
Steve Harris	8cffb55371	13.2.1-8 baseline ... Former-commit-id: 18da2e93d7 [formerly f81b382c04] [formerly 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]] Former-commit-id: 053156f02e Former-commit-id: c6d584758f	2013-02-18 09:09:41 -06:00
Ron Anderson	d69d628450	Issue #1608 Fixed group deletes in H5pyDataStore.py ... Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a Former-commit-id: dc7c9edb87 [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]] Former-commit-id: 7c0a5d74bf Former-commit-id: e952a4f179	2013-02-15 09:03:41 -06:00
Steve Harris	7c5e57d662	Merge branch 'ss_builds' (13.2.1-7) into development ... Former-commit-id: 760be15f59 [formerly cc2757790c] [formerly de437bb4fc [formerly 62e4a9045e32eaaf1a52ff06d86f82d2693021bd]] Former-commit-id: de437bb4fc Former-commit-id: 3690662bf7	2013-02-12 15:30:10 -06:00
Steve Harris	2d04721c4b	13.2.1-7 baseline ... Former-commit-id: 3f271af195 [formerly 2fb5a31b98] [formerly 6baff6a089 [formerly 85a6ac3debfd1691b5d44c547d76a7ae9e19523f]] Former-commit-id: 6baff6a089 Former-commit-id: bac9b967aa	2013-02-12 15:27:30 -06:00
Steve Harris	6780b60df5	13.2.1-7 baseline ... Former-commit-id: 0b7287b130 [formerly 6fad5da5ed] [formerly 9c23bf6e73 [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]] Former-commit-id: 9c23bf6e73 Former-commit-id: 6bfbfc8a5e	2013-02-12 14:51:26 -06:00
Steve Harris	b119d66cda	Merge branch '13.2.1_delivery' into development ... Former-commit-id: da43a7a8ca [formerly 4bc8e9ab5c] [formerly 5ee47e098d [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]] Former-commit-id: 5ee47e098d Former-commit-id: 3ad515e28f	2013-02-06 11:12:01 -06:00
Steve Harris	48a0ffda4d	Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery ... Conflicts: cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java Former-commit-id: 14f23d4227 [formerly a16ac7819c] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]] Former-commit-id: 6c6b53679b Former-commit-id: 28ddc9bad8	2013-02-06 11:08:53 -06:00
Steve Harris	7497a15e22	13.2.1-5 baseline ... Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]] Former-commit-id: 146fcc6da8 Former-commit-id: 1c602ec3a7	2013-02-06 11:02:32 -06:00
Bryan Kowal	efe288c82c	Issue #1577 - deploy-install and AWIPS II ant task updates ... - includegen will now fail if a plugin is included in two or more features - includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates - removed a plugin from the ncep feature that was also in the cots feature - the includegen failure will cause deploy-install to fail - peer review comments; excluding significant re-factoring Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f Former-commit-id: 81da18f851 [formerly 7815b651bb] [formerly 5fea87f1dd [formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]] Former-commit-id: 5fea87f1dd Former-commit-id: 99994d3151	2013-02-05 13:25:15 -06:00
Steve Harris	3f25b862c8	13.2.1-4 baseline ... Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]] Former-commit-id: 0d7f53b6f4 Former-commit-id: 2998f750f4	2013-01-31 11:40:31 -06:00
Steve Harris	251a9c0195	13.2.1-2 baseline ... Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]] Former-commit-id: c3e4551dfa Former-commit-id: 1153d80c5b	2013-01-25 09:07:12 -06:00
Steve Harris	d9be4dce21	13.2.1-2 baseline ... Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]] Former-commit-id: 328c6dccad Former-commit-id: 47cc08ac79	2013-01-23 11:18:44 -05:00
Steve Harris	8ed6a53113	13.2.1-1 baseline ... Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]] Former-commit-id: c63f9bcae0 Former-commit-id: f6670806bf	2013-01-23 11:13:03 -05:00
Steve Harris	39f9dc931a	13.1.2-10 baseline ... Former-commit-id: 683193255d [formerly 68dde17de2] [formerly 86ea0b666e [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]] Former-commit-id: 86ea0b666e Former-commit-id: d148beb4ca	2013-01-18 10:37:25 -05:00
Bryan Kowal	d9832e846b	Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path ... Former-commit-id: 86bd4e3b3f [formerly a2f745ec54] [formerly 5d769d8a8d [formerly 42a05fc36d0ba3036a7e056d8871f684abf986c9]] Former-commit-id: 5d769d8a8d Former-commit-id: 2bb5377a4d	2013-01-17 09:59:11 -06:00
Bryan Kowal	1eb4e6d41e	Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path ... Former-commit-id: 55550007cb [formerly 2ed28bed93] [formerly 8c118e791b [formerly 18676a8f73c7ac0eb2ce0ff25cf3c66ae1f72f02]] Former-commit-id: 8c118e791b Former-commit-id: 0a39b4ddf1	2013-01-15 18:46:46 -06:00
Bryan Kowal	8a7376ed60	Issue #1469 - updated for compatibility with recent changes to Pypies. ... Former-commit-id: 90b9cf9804 [formerly 02c16b6f3d] [formerly d710e987e4 [formerly 417ecdcc5b9907b95856571d5d03fa12099eb3f6]] Former-commit-id: d710e987e4 Former-commit-id: 37d1aee965	2013-01-15 16:09:42 -06:00
Bryan Kowal	38480e46b1	Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict. ... Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3 Former-commit-id: fba28ea69b [formerly e2a12845d3] [formerly 4db9c6c321 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]] Former-commit-id: 4db9c6c321 Former-commit-id: c1330e8121	2013-01-15 14:56:01 -06:00
Richard Peter	fa6247baf7	Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java Former-commit-id: ae3ea75cbf [formerly 1318f53902] [formerly b8e42dabc0 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]] Former-commit-id: b8e42dabc0 Former-commit-id: aa9e16b038	2013-01-14 17:38:38 -06:00
Steve Harris	7d0109a349	13.1.2-8 baseline ... Former-commit-id: b864fdc303 [formerly e6217a17de] [formerly 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]] Former-commit-id: 06b8eb8db0 Former-commit-id: 3caf592e83	2013-01-11 16:19:07 -05: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
Ben Steffensmeier	a8b4746176	Issue #1362 add null chack in nsharp mouse handler. ... Former-commit-id: b05bf7b6e2 [formerly 1186724fa8] [formerly a836aee481 [formerly 4ae38765c9a6815050d30b307b4a364b617c49aa]] Former-commit-id: a836aee481 Former-commit-id: 3a4661685a	2013-01-08 18:17:24 -06:00
Steve Harris	82a1ed77a4	13.1.2-6 baseline ... Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]] Former-commit-id: 59969775ad Former-commit-id: dbcae57f57	2013-01-06 14:55:11 -06:00
Steve Harris	cd4185ef5c	13.1.2-2 baseline ... Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]] Former-commit-id: 4ba416aeb3 Former-commit-id: 941337c553	2013-01-06 14:32:24 -06:00
Max Schenkelberg	3a1106efa0	Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor. ... Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde Former-commit-id: 08160fff31 [formerly fabb9bbcff] [formerly 7e3273db95 [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]] Former-commit-id: 7e3273db95 Former-commit-id: 904270b99b	2012-12-20 17:14:34 -06:00
Steve Harris	f02c1ef71d	Merge branch 'ss_builds' (12.12.1-12) into development ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]] Former-commit-id: f6988eefff Former-commit-id: 6287b32e7d	2012-12-11 08:45:53 -06:00
Steve Harris	ff4131c2ee	12.12.1-8 baseline ... Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]] Former-commit-id: 5093a7c442 Former-commit-id: ee06a94735	2012-12-06 09:02:51 -06:00
Max Schenkelberg	f681c1304c	Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins ... Amend: Added back in TimeMatchBasisCapability. Someday will need to figure out bundle migration since this unused class can never die Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6 Former-commit-id: 56ae27e172 [formerly b648c5828e] [formerly ed77d56a84 [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]] Former-commit-id: ed77d56a84 Former-commit-id: b24440cc37	2012-11-29 10:29:36 -06:00
Nate Jensen	9158625765	Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development ... Former-commit-id: 0398aeaa5b [formerly 49c2079963] [formerly 31637efbbc [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]] Former-commit-id: 31637efbbc Former-commit-id: 8944e220f6	2012-11-14 16:09:00 -06:00
Dustin Johnson	5d5dbe27e1	Merge branch 'ss_builds' (12.12.1-4) into development ... Conflicts: ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71 Former-commit-id: d27bce13c2 [formerly bff32bbe58] [formerly 0d1d663f41 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]] Former-commit-id: 0d1d663f41 Former-commit-id: e25b7c312b	2012-11-14 14:41:57 -06:00
Steve Harris	e35a321a8c	12.12.1-4 baseline ... Former-commit-id: b91b7f0fae [formerly 85130eb611] [formerly 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]] Former-commit-id: 57578da521 Former-commit-id: 628ca9e5c6	2012-11-14 14:19:20 -06:00
Ben Steffensmeier	47759f025b	Issue #189 changes to mappings and ncep merge from code review ... Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47 Former-commit-id: 3d126b41e1 [formerly 2c8f3f09ac] [formerly 2d864c3b09 [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]] Former-commit-id: 2d864c3b09 Former-commit-id: 91254adfd6	2012-11-14 12:22:53 -06:00
Ben Steffensmeier	d75b59622a	Issue #189 merge ncep changes to unified grid. ... Change-Id: I3dac0d3785f093c095f50799890744919edb1891 Former-commit-id: f62cf2713d [formerly e6b0751f5c] [formerly fbed67a208 [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]] Former-commit-id: fbed67a208 Former-commit-id: 7c9341a3a6	2012-11-08 14:34:55 -06:00