Steve Harris
|
a85a777232
|
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 23cc9689de [formerly 0c520ee63a42d53754686f52ffa5b94a0fe4eea1]]
Former-commit-id: 23cc9689de
Former-commit-id: a2e3aabc60
|
2012-02-15 14:39:43 -06:00 |
|
Bryan Kowal
|
134b8f2915
|
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: 2fabaff1d9 [formerly 38eb4bd2b6] [formerly 521756e57e [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]
Former-commit-id: 521756e57e
Former-commit-id: 1c023403e2
|
2012-02-15 10:31:58 -06:00 |
|
Bryan Kowal
|
0bf4fecb62
|
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: c78e988d55 [formerly 67562b0674] [formerly 4faf9831ed [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]
Former-commit-id: 4faf9831ed
Former-commit-id: eb91bb964e
|
2012-02-13 13:57:10 -06:00 |
|
Bryan Kowal
|
f6b08149ad
|
Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: be0b6a87eb [formerly 5039d66b12] [formerly cf4d56d0a0 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 90c33ef882
|
2012-01-23 13:25:11 -06:00 |
|
Matt Nash
|
82300ccdcf
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
root
|
8e80217e59
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|