Commit graph

8 commits

Author SHA1 Message Date
Steve Harris
221a02882a 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: 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]
Former-commit-id: b9f4780fcb
2012-02-15 14:39:43 -06:00
Bryan Kowal
2fabaff1d9 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: 521756e57e [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]
Former-commit-id: 38eb4bd2b6
2012-02-15 10:31:58 -06:00
Ben Steffensmeier
808846e237 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: f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]
Former-commit-id: 944e59e989
2012-02-14 15:46:11 -06:00
Bryan Kowal
c78e988d55 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: 4faf9831ed [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]
Former-commit-id: 67562b0674
2012-02-13 13:57:10 -06:00
Bryan Kowal
3fecaf9a5a Issue #197 - merging gridslice changes into git thinclient branch.
Former-commit-id: a48a3094f0 [formerly ae1bd95af06f6413ff17b73b290fda3ab8a13b29]
Former-commit-id: 710c7af072
2012-01-23 13:40:59 -06:00
Bryan Kowal
be0b6a87eb Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: cf4d56d0a0 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]
Former-commit-id: 5039d66b12
2012-01-23 13:25:11 -06:00
Matt Nash
580e2938d7 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: 66be3bec40
2012-01-19 11:53:12 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00