Commit graph

16 commits

Author SHA1 Message Date
Bryan Kowal
76ee9afb3f Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: 2acacb211a [formerly c629f18f24] [formerly 99d22f395a] [formerly f92eb59a73 [formerly 99d22f395a [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]]
Former-commit-id: f92eb59a73
Former-commit-id: 52cad006ad06844a2b34006f7defa2ec2dc2d67f [formerly 580172b47c]
Former-commit-id: 8d64fdba2c
2012-07-10 16:57:16 -05:00
Steve Harris
7550311ef6 12.6.1-10 baseline
Former-commit-id: a9742f306e [formerly edac4d827c] [formerly 8dc4a774e2] [formerly 3cd0902b49 [formerly 8dc4a774e2 [formerly dd65e6d99709e0117519a1f2a2f02a41c8938d0e]]]
Former-commit-id: 3cd0902b49
Former-commit-id: 1a8021953ed3a77781e285be5837377b59afd5e3 [formerly eacd5aeb7f]
Former-commit-id: efe25edfad
2012-06-21 08:58:00 -05:00
Steve Harris
bc695ee025 12.5.1-6 baseline
Former-commit-id: ba6d779949 [formerly df80148db6] [formerly ffae06aa7059ba46bdf5d6194d790ed5d3513713 [formerly 24474489f9]] [formerly fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]]
Former-commit-id: fa87dc6cf1
Former-commit-id: 0fa00c0acf0db00500f5839edb5595f4cd6535d5 [formerly c452cce633]
Former-commit-id: 4792884ab2
2012-05-16 16:41:22 -05:00
Steve Harris
8025cc609e 12.5.1-2 baseline
Former-commit-id: c1bc408f84 [formerly ac708c050d] [formerly 84d191e7b6] [formerly b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]]
Former-commit-id: b36c69cc67
Former-commit-id: 22cf2530d98a6c3d2d24e8ef75454ae00fe19292 [formerly a821111fbf]
Former-commit-id: f6300cd995
2012-05-03 19:17:13 -05:00
Steve Harris
caab7c1fbb 12.4.1-10 baseline
Former-commit-id: 931087306f [formerly 418489e726] [formerly 704b75e1a1] [formerly 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]]
Former-commit-id: 01457fbbde
Former-commit-id: bd1ff6d9b99902d235b63b9c84d31f1a058625ee [formerly aabc3842ac]
Former-commit-id: 97caaa0327
2012-04-24 15:38:29 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Steve Harris
11e448aa39 12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]
Former-commit-id: 8bc60b1e32
2012-03-30 08:38:33 -05:00
Bryan Kowal
2d6d83c3d8 Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory.
Former-commit-id: 75c8f18793 [formerly d4b76c1057] [formerly 4276fc2fe8] [formerly 9f1b7a613a [formerly 4276fc2fe8 [formerly 1ec51accade835c1133eac9222131f9186985053]]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 25079234f2afb61c81441d4fa189a886bdbf5294 [formerly 38ccaf882b]
Former-commit-id: 8a71854fe1
2012-02-17 11:09:13 -06:00
Steve Harris
f3d32f34ce 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: 6d3d1066eb [formerly 221a02882a] [formerly b9f4780fcb] [formerly 23cc9689de [formerly b9f4780fcb [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]]
Former-commit-id: 23cc9689de
Former-commit-id: 601b02191762801f860cf28b52a200c6e003e7ea [formerly a2e3aabc60]
Former-commit-id: a85a777232
2012-02-15 14:39:43 -06:00
Bryan Kowal
83ba57dcd1 Issue #243 - it is now possible to build meteolib on Windows; meteolib, jep, and gridslice are now all built using MSBuild when built from the command line.
Former-commit-id: 7b5b643d18 [formerly 2fabaff1d9] [formerly 38eb4bd2b6] [formerly 521756e57e [formerly 38eb4bd2b6 [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]]
Former-commit-id: 521756e57e
Former-commit-id: 66ae2354057f0c9b76ece5f6ef014f53d118b46b [formerly 1c023403e2]
Former-commit-id: 134b8f2915
2012-02-15 10:31:58 -06:00
Ben Steffensmeier
6212d0efc7 Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58

Issue #342 - edex_com, edex_notify, and awips2-notification updates.
Change-Id: Iba95d0fac10f40c76db4a46924f93cbbe40da4a2

Former-commit-id: 2edb2afe04 [formerly 808846e237] [formerly 944e59e989] [formerly f65d86a06a [formerly 944e59e989 [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]]
Former-commit-id: f65d86a06a
Former-commit-id: 2203a419ff9c3a59fd6802a9ac886bf01d7ca8c3 [formerly d00572c122]
Former-commit-id: 993f2aafa4
2012-02-14 15:46:11 -06:00
Bryan Kowal
2e2b3b4869 Issue #243 - standardized the Windows build of jep and gridslice. Both can be built from within Visual C++ 2008 or headless via a cmd console.
Former-commit-id: 02c48be369 [formerly c78e988d55] [formerly 67562b0674] [formerly 4faf9831ed [formerly 67562b0674 [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]]
Former-commit-id: 4faf9831ed
Former-commit-id: e75d6befa5289852fa8cf3ebd7ce2bc1848f4f41 [formerly eb91bb964e]
Former-commit-id: 0bf4fecb62
2012-02-13 13:57:10 -06:00
Bryan Kowal
49aa09a64e Issue #197 - merging gridslice changes into git thinclient branch.
Former-commit-id: 79ac259d23 [formerly 3fecaf9a5a] [formerly 710c7af072] [formerly a48a3094f0 [formerly 710c7af072 [formerly ae1bd95af06f6413ff17b73b290fda3ab8a13b29]]]
Former-commit-id: a48a3094f0
Former-commit-id: 4aa5a8ae50eb5f7b9533fdcfb05d524989a9f2cd [formerly ebcff5bae9]
Former-commit-id: 1821f12dee
2012-01-23 13:40:59 -06:00
Bryan Kowal
3bc50618b7 Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly cf4d56d0a0 [formerly 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 04447b381e8f34176bf56aeac8375d7e5d6866ba [formerly 90c33ef882]
Former-commit-id: f6b08149ad
2012-01-23 13:25:11 -06:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00