Mirror of Unidata's AWIPS2.

Shawn.Hooper d1cfaab789 Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2 ... Conflicts: cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java Change-Id: I6c0ee27d5dba0255a365886af61f124bd4b64744 Former-commit-id: 12523a79aae3630156c95e62dc87e7ac4e1521c1		2016-06-07 10:30:36 -04:00
build	Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2	2016-05-19 22:07:52 -05:00
cave	Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2	2016-06-07 10:30:36 -04:00
cm/AWIPS2_NWS	Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2	2016-05-12 09:28:49 -05:00
deltaScripts	Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2	2016-06-01 15:05:08 -04:00
edexOsgi	Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2	2016-06-03 16:23:13 -04:00
javaUtilities	Merge branch 'omaha_16.2.1' into omaha_16.2.2	2016-01-06 11:55:00 -06:00
localApps	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
localization	VLab Issue #12697 -DCS18223 Baseline additional maps; fixes #12697	2015-10-26 14:12:40 +00:00
nativeLib	Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2	2016-05-12 09:28:49 -05:00
pythonPackages	Omaha #5426 Add issueYear to active table primary key	2016-03-17 10:33:29 -05:00
RadarServer	Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2	2016-05-12 09:28:49 -05:00
rpms	Merge tag 'OB_16.2.1-lx-29' into omaha_16.2.2	2016-05-12 09:28:49 -05:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tests	Omaha #4839 Update for Jetty9 compatibility. Remove jetty jars from tests.	2015-11-19 15:56:02 -05:00
.gitignore	Omaha #3685 Add support for sending specific products in mixed case	2014-10-22 14:29:30 -05:00