Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 8354ca4e68 Merge branch 'ss_builds' (12.10.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java

Former-commit-id: 4ebdc29db766db49df46d568a320c1743d0bb7c0
2012-09-25 10:31:57 -05:00
cave Merge branch 'ss_builds' (12.10.1-8) into development 2012-09-25 10:31:57 -05:00
cots Issue #1091 Added localMaps.py capability 2012-09-19 17:41:48 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo 2012-09-13 15:39:58 -05:00
edexOsgi Merge branch 'ss_builds' (12.10.1-8) into development 2012-09-25 10:31:57 -05:00
javaUtilities 12.10.1-3 baseline 2012-09-11 16:00:38 -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 12.6.1-9 baseline 2012-07-10 07:53:49 -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-8) into development 2012-09-25 10:31:57 -05:00
ncep Issue #1131 merge multipane nsharp into D2D. 2012-09-20 17:28:54 -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-8) into development 2012-09-25 10:31:57 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tools Merge branch 'master' (OB12.7.1-8) into development 2012-07-27 14:44:44 -05:00
.gitignore 12.10.1-4 baseline 2012-09-13 12:08:11 -05:00