Commit graph

5 commits

Author SHA1 Message Date
Slav Korolev
9d0e31155f Issue #2875 - Implemented HFR Surface Current Velocity.
Change-Id: I586e6aa4064df538b0dcb7012f7c26ce529e4761

This reverts commit fe4b0de79bdc9f7d9251320f16b6046314117f1f [formerly e5af41fa86] [formerly 55a1120bdb [formerly dd9d117f90] [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]].

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: 1c896cedab [formerly a9bed4c6fd] [formerly 1c896cedab [formerly a9bed4c6fd] [formerly a779c786f1 [formerly aee044437492438381db98cc6fd3a917f6c05659]]]
Former-commit-id: a779c786f1
Former-commit-id: d080af879e [formerly 407be3d26f]
Former-commit-id: 99a8258e86
2014-08-19 10:12:36 -05:00
Steve Harris
106e45a937 Issue #3507 - Revert "Issue #2875 - Implemented HFR Surface Current Velocity."
This reverts commit 5a3f760b6f51d0561dd605388e6b025ebe70e330 [formerly 7ae3ca0bfc] [formerly 50e93daab7 [formerly 978349e517] [formerly 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]].


Former-commit-id: 55a1120bdb [formerly dd9d117f90] [formerly 55a1120bdb [formerly dd9d117f90] [formerly e5af41fa86 [formerly e861a7dd5f517f28991530a7e46a4f5db1826d4f]]]
Former-commit-id: e5af41fa86
Former-commit-id: 8c5cbf7224 [formerly 0739666ae9]
Former-commit-id: 9ce3fc1803
2014-08-12 10:19:12 -05:00
Slav Korolev
3687b20fe7 Issue #2875 - Implemented HFR Surface Current Velocity.
Former-commit-id: 50e93daab7 [formerly 978349e517] [formerly 50e93daab7 [formerly 978349e517] [formerly 7ae3ca0bfc [formerly f2788ef1881d66467b5aa200b849b6fcf4608b21]]]
Former-commit-id: 7ae3ca0bfc
Former-commit-id: 4ef0572c2d [formerly 14cf56ec46]
Former-commit-id: a3e480a756
2014-08-12 09:19:22 -04:00
Bryan Kowal
731efe0fb6 Merge branch 'master_14.1.1' into omaha_14.1.1
Conflicts:
	nativeLib/files.native/files.native.ecl
	nativeLib/ncep_grib2module/.cproject
	nativeLib/rary.cots.g2clib/.project
	nativeLib/rary.cots.g2clib/g2_unpack3.c
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1

Former-commit-id: 4d7a4aefec [formerly 665911b033] [formerly 4d7a4aefec [formerly 665911b033] [formerly c76c856340 [formerly 412bcb0f21b7385a170d14b3a88dd67c91a301a2]]]
Former-commit-id: c76c856340
Former-commit-id: 7a83214b1c [formerly 0954490a5a]
Former-commit-id: 6e08dc72c0
2013-10-31 15:23:08 -05:00
Bryan Kowal
15cb18c19f Issue #2396 - updated grib2.so to use a newer version of g2clib
Former-commit-id: 2ad7db4f5d [formerly b7b11dc747] [formerly 2ad7db4f5d [formerly b7b11dc747] [formerly 9a472e1bbe [formerly 6730ef07554b6e335427bcf08dded302fcc4a398]]]
Former-commit-id: 9a472e1bbe
Former-commit-id: b1bdf0dbc5 [formerly f892849313]
Former-commit-id: 83c0c7e365
2013-10-16 12:54:58 -05:00