Mirror of Unidata's AWIPS2.

Steve Harris 9d1f595fe6 Merge branch 'ss_builds' (12.10.1-4) into development ... Conflicts: cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java Former-commit-id: bedc9569ca [formerly 04de1d5857] [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]] Former-commit-id: 04d9735c8f Former-commit-id: 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6] Former-commit-id: e23b030dfd		2012-09-13 13:26:13 -05:00
cave	Merge branch 'ss_builds' (12.10.1-4) into development	2012-09-13 13:26:13 -05:00
cots	Issue #1134 - edex will now use the same jep library that CAVE does	2012-09-07 10:28:51 -05:00
cotsSource/org.apache.qpid	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
deltaScripts	12.10.1-4 baseline	2012-09-13 12:08:11 -05:00
edexOsgi	Merge branch 'ss_builds' (12.10.1-4) into development	2012-09-13 13:26:13 -05:00
javaUtilities	Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick)	2012-09-05 14:44:36 -05:00
ldm	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
localApps	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
localization	Revert "12.6.1-10 baseline"	2012-06-21 08:51:08 -05:00
MHSEmulator	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
msi	Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds	2012-08-21 16:17:58 -05:00
nativeLib	Merge branch 'ss_builds' (12.10.1-4) into development	2012-09-13 13:26:13 -05:00
ncep	Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.	2012-09-11 16:27:41 -05:00
ost	12.10.1-1 baseline	2012-09-04 12:07:27 -05:00
pythonPackages	Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.	2012-09-10 10:45:37 -05:00
RadarServer	12.10.1-4 baseline	2012-09-13 12:08:11 -05:00
rpms	Merge branch 'ss_builds' (12.10.1-4) into development	2012-09-13 13:26:13 -05:00
testProcedures/testDocuments	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
tools	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
.gitignore	12.10.1-4 baseline	2012-09-13 12:08:11 -05:00