Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 012c526816 Merge branch 'ss_builds' (12.10.1-3) into development
Conflicts:
	cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
	cave/com.raytheon.uf.viz.kml.export.feature/build.properties
	cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
	cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
	cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
	cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
	rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment

Former-commit-id: e4e12a182b674b136c2753e3fd2f79a3a338ebee
2012-09-11 16:57:03 -05:00
cave Merge branch 'ss_builds' (12.10.1-3) into development 2012-09-11 16:57:03 -05:00
cots 12.10.1-3 baseline 2012-09-11 16:00:38 -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-3 baseline 2012-09-11 16:00:38 -05:00
edexOsgi Merge branch 'ss_builds' (12.10.1-3) into development 2012-09-11 16:57:03 -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 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-1) into development 2012-09-04 12:11:03 -05:00
ncep 12.10.1-3 baseline 2012-09-11 16:00:38 -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.9.1-5 baseline 2012-08-21 15:27:03 -05:00
rpms 12.10.1-3 baseline 2012-09-11 16:00:38 -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 Merge branch 'ss_sync' into 9-Wes2Bridge 2012-02-27 15:58:49 -06:00