6 commits

Author	SHA1	Message	Date
Bryan Kowal	f48df7de50	Issue #1416: added the python package shapely ... - shapely and dependencies will now be built as part of the 32-bit build and the 64-bit build from source - shapely will also be included as part of the AWIPS II MSFT Windows environment Former-commit-id: ef0b12813d [formerly 8d1e29448a] [formerly ef0b12813d [formerly 8d1e29448a] [formerly 5e22c24657 [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]] Former-commit-id: 5e22c24657 Former-commit-id: 976834171e [formerly 6103e7c485] Former-commit-id: bf96e5cf59	2012-12-17 15:27:43 -06:00
Bryan Kowal	49f45e1901	Issue #1354 - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features ... Change-Id: Ib0f1a90fc55293cff2d43d236bec93001d93e8bf Former-commit-id: 3a4ca9582d [formerly d3b455c955] [formerly 3a4ca9582d [formerly d3b455c955] [formerly f99d351995 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]] Former-commit-id: f99d351995 Former-commit-id: ae64e9ce3b [formerly b0c65323b6] Former-commit-id: 774d3a8f8d	2012-11-28 16:30:10 -06:00
Steve Harris	85533bdd24	Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds ... Conflicts: cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java edexOsgi/build.edex/edex/allElements.xml edexOsgi/build.edex/edex/customAssembly.xml edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so edexOsgi/build.edex/esb/lib/native/linux64/libjep.so nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs nativeLib/rary.cots.jasper/jasper-1.900.1/configure rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0 rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0 rpms/awips2.edex/deploy.builder/build.sh rpms/build/i386/build.sh tools/scripts/commit-msg tools/scripts/git-u-setup tools/scripts/uamend tools/scripts/ucommit tools/scripts/upull tools/scripts/upush tools/scripts/ustat Former-commit-id: 084ac9fbd4 [formerly d38f8b80f0] [formerly 084ac9fbd4 [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]] Former-commit-id: 44a7cb75e7 Former-commit-id: b335416e06 [formerly 77369f78a6] Former-commit-id: 445d1a6a0d	2012-08-21 16:17:58 -05:00
Steve Harris	74b66d9683	12.4.1-4 baseline ... Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]] Former-commit-id: 2a216f333c Former-commit-id: a2a6a18fae [formerly a4e519f3cd] Former-commit-id: 8cd5974f4c	2012-04-18 15:18:16 -05:00
Steve Harris	3598fb2fcd	Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client ... Conflicts: msi/AWIPSII.CAVE/AWIPSII.CAVE/ipr.gif msi/AWIPSII.CAVE/AWIPSII.CAVE/obj/x86/Release/_DELETE_ME_ nativeLib/rary.cots.jepp/jepp-2.3/windows/Release/_DELETE_ME_ Chose to keep in 4-Thin_Client Former-commit-id: 221a02882a [formerly b9f4780fcb] [formerly 221a02882a [formerly b9f4780fcb] [formerly 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]] Former-commit-id: 23cc9689de Former-commit-id: a85a777232 [formerly a2e3aabc60] Former-commit-id: b2999a6d59	2012-02-15 14:39:43 -06:00
Bryan Kowal	28028b9ad3	Issue #22 - merging Windows MSI installer changes into git thinclient branch. ... Former-commit-id: be61ec82b0 [formerly 48b420cbb2] [formerly be61ec82b0 [formerly 48b420cbb2] [formerly ff44a81ceb [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]] Former-commit-id: ff44a81ceb Former-commit-id: bddafa475a [formerly 5eb9afeb98] Former-commit-id: dd1c5cdee4	2012-01-23 12:36:13 -06:00