Commit graph

259 commits

Author SHA1 Message Date
Steve Harris
d3c80a1557 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
Former-commit-id: a2fd2cf6fa [formerly 6a064cb78b] [formerly a2fd2cf6fa [formerly 6a064cb78b] [formerly d02529fef4 [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]
Former-commit-id: d02529fef4
Former-commit-id: b41e5f2415 [formerly d133454b27]
Former-commit-id: d9c8a99210
2012-02-20 12:54:25 -06:00
Steve Harris
60bf5aeced Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: c268da57bc [formerly 4b76d22f77] [formerly c268da57bc [formerly 4b76d22f77] [formerly cc66c8be24 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]
Former-commit-id: cc66c8be24
Former-commit-id: dd911bed4d [formerly 54b5b6baef]
Former-commit-id: 09b81c6e00
2012-02-20 12:43:38 -06:00
Steve Harris
9a09879521 Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: c209d6de36 [formerly 93f6535bd8] [formerly c209d6de36 [formerly 93f6535bd8] [formerly b137302802 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]
Former-commit-id: b137302802
Former-commit-id: 1ac6b36d1f [formerly 65b22abd24]
Former-commit-id: 895404abeb
2012-02-17 10:55:02 -06:00
Steve Harris
87ffdc4f01 Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 695e2979c3 [formerly 1002555dbd] [formerly 695e2979c3 [formerly 1002555dbd] [formerly f693b6d0a7 [formerly d31ccf5832bf2b2ccfe29126deb4da80806c6739]]]
Former-commit-id: f693b6d0a7
Former-commit-id: 93e856457b [formerly f650243958]
Former-commit-id: 3cbce90726
2012-02-09 08:54:18 -06:00
Max Schenkelberg
0f4a0c7948 Issue #206 Made tear off menu dialog activate contexts for perspective
Former-commit-id: c410a4eb33 [formerly 5f8d30bb43] [formerly c410a4eb33 [formerly 5f8d30bb43] [formerly e422b13ded [formerly 56103eb133de5325d62bb3453b2353e5d5e23ddd]]]
Former-commit-id: e422b13ded
Former-commit-id: 2185e1a31e [formerly 3a26b0cea5]
Former-commit-id: 1954b637a4
2012-02-01 17:03:20 -06:00
Ben Steffensmeier
774f2614d0 Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 138b4de82f [formerly 0617773c79] [formerly 138b4de82f [formerly 0617773c79] [formerly 9b78596436 [formerly 067ba5b7d28174d99119d5bf87a28334578f78dd]]]
Former-commit-id: 9b78596436
Former-commit-id: 5deb83a291 [formerly a714f57f78]
Former-commit-id: 82db9d2c0c
2012-01-31 10:53:10 -06:00
Matt Nash
8997f82570 Issue #26 add tear off code to git baseline
Former-commit-id: 892cb9a7ae [formerly cf4e1f764e] [formerly 892cb9a7ae [formerly cf4e1f764e] [formerly 4286cb0342 [formerly dedac216cfa51bd413f7c4d1f7db5ee8ce665866]]]
Former-commit-id: 4286cb0342
Former-commit-id: e8d239e963 [formerly 8e3d2af84e]
Former-commit-id: 240ac978f2
2012-01-25 12:50:31 -06:00
Matt Nash
bcc32c10bc Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00