Steve Harris
|
01d72ca3c9
|
Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 85075e6107 [formerly 94c2ea985b] [formerly 85075e6107 [formerly 94c2ea985b] [formerly 9995d22e25 [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]
Former-commit-id: 9995d22e25
Former-commit-id: 610fdf3f4e [formerly aaead73ec5]
Former-commit-id: 156ad8471d
|
2012-02-22 10:12:49 -06:00 |
|
Steve Harris
|
a9cfeacc6b
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 2c12c02910 [formerly 84926c80be] [formerly 2c12c02910 [formerly 84926c80be] [formerly f3fe839c1c [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]]
Former-commit-id: f3fe839c1c
Former-commit-id: 968239217e [formerly 6d1b04e62c]
Former-commit-id: a14d90ed4d
|
2012-02-21 10:37:36 -06:00 |
|
Nate Jensen
|
0d56994428
|
Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client
Former-commit-id: ba5b1ee03f [formerly b90611d995] [formerly ba5b1ee03f [formerly b90611d995] [formerly ec0cd8d086 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]]
Former-commit-id: ec0cd8d086
Former-commit-id: 2ee4305d77 [formerly 13ea11ddfc]
Former-commit-id: f92be47f79
|
2012-02-21 08:57:12 -06:00 |
|
Steve Harris
|
cfea5008c1
|
Merge branch 'ss_sync'
Former-commit-id: de7a3491fa [formerly 7be1fb41ea] [formerly de7a3491fa [formerly 7be1fb41ea] [formerly 4e1def89e7 [formerly b1c075b5f5af7df5058a409622a59b7d13b36416]]]
Former-commit-id: 4e1def89e7
Former-commit-id: c2683ac759 [formerly b2965389c7]
Former-commit-id: c40f342dbe
|
2012-02-20 16:51:00 -06:00 |
|
Ben Steffensmeier
|
f934ade63a
|
Issue #345 fix issues with gl contexts and creation and deletion of gl objects!
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db
Former-commit-id: 27973ec694 [formerly 69e8cde115] [formerly 27973ec694 [formerly 69e8cde115] [formerly 73d24fad2f [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]]
Former-commit-id: 73d24fad2f
Former-commit-id: 0ee68fb6cc [formerly dcbe4fc7da]
Former-commit-id: f949f622dd
|
2012-02-20 15:28:20 -06:00 |
|
Steve Harris
|
161bc7ddc8
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: ef21df5086 [formerly 07bf1f770d] [formerly ef21df5086 [formerly 07bf1f770d] [formerly ebf5e8360e [formerly 80817ea48545c3315d8445c9acae60b6c92088f7]]]
Former-commit-id: ebf5e8360e
Former-commit-id: 2ffbfd0181 [formerly 5bc52de24a]
Former-commit-id: 06fd623597
|
2012-02-20 13:04:10 -06:00 |
|
Steve Harris
|
bcccffbaa4
|
Merge branch '10-Tech_Blocked' into 104-integration
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: d971880b98 [formerly cabf9fd956] [formerly d971880b98 [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: b12f5e5d75 [formerly 33483f3960]
Former-commit-id: acd7845ebd
|
2012-02-20 13:03:39 -06:00 |
|
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
|
41571066d5
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: e3535054ff [formerly 62c587b841] [formerly e3535054ff [formerly 62c587b841] [formerly c825bd03a2 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]]
Former-commit-id: c825bd03a2
Former-commit-id: b609a6fd60 [formerly 0fab56e0f1]
Former-commit-id: f265cb965d
|
2012-02-20 07:49:13 -06:00 |
|
Bryan Kowal
|
ce9165ce58
|
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 5754f9dfd8 [formerly 10a0ca252d] [formerly 5754f9dfd8 [formerly 10a0ca252d] [formerly 682c10767d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]]
Former-commit-id: 682c10767d
Former-commit-id: cc8c6597a2 [formerly 2ba23624b4]
Former-commit-id: 8403801a2b
|
2012-02-17 12:17:14 -06:00 |
|
Bryan Kowal
|
9db8b4f405
|
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: d4b76c1057 [formerly 4276fc2fe8] [formerly d4b76c1057 [formerly 4276fc2fe8] [formerly 9f1b7a613a [formerly 1ec51accade835c1133eac9222131f9186985053]]]
Former-commit-id: 9f1b7a613a
Former-commit-id: 8a71854fe1 [formerly 38ccaf882b]
Former-commit-id: 2fefca4860
|
2012-02-17 11:09:13 -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 |
|
Ben Steffensmeier
|
b648274e36
|
Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified.
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0
Former-commit-id: 38993f5a5a [formerly 26d82729c9] [formerly 38993f5a5a [formerly 26d82729c9] [formerly 3e3e4bd4e3 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]]
Former-commit-id: 3e3e4bd4e3
Former-commit-id: ea93dcd939 [formerly d4e7df98a9]
Former-commit-id: c286cb0406
|
2012-02-16 16:36:56 -06:00 |
|
Steve Harris
|
caa8a19335
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: c26a22cfb7 [formerly e2989d1a9f] [formerly c26a22cfb7 [formerly e2989d1a9f] [formerly 64ddef69b6 [formerly d3ca90194ff9d361ba9ff7679c2f4da43a439de4]]]
Former-commit-id: 64ddef69b6
Former-commit-id: 840c858697 [formerly ff45f4eaab]
Former-commit-id: c2cf0253bf
|
2012-02-16 14:23:01 -06:00 |
|
Nate Jensen
|
f30073312c
|
Merge "Issue #343 remove extra perspectives when in thinclient component" into 4-Thin_Client
Former-commit-id: c20df8b229 [formerly bdb08a9f4c] [formerly c20df8b229 [formerly bdb08a9f4c] [formerly 642ad4e9b0 [formerly 712f278a25a67d3d05375213b4d5bc8e7743aaa9]]]
Former-commit-id: 642ad4e9b0
Former-commit-id: 9a8dd201c5 [formerly 051e8faf55]
Former-commit-id: f7767084b6
|
2012-02-16 14:00:33 -06:00 |
|
Bryan Kowal
|
6d311633c4
|
Issue #34 - recompiled the nsharp dll with the latest ncep code.
Former-commit-id: 2ce7c520b3 [formerly c8dba08a9d] [formerly 2ce7c520b3 [formerly c8dba08a9d] [formerly 4888756560 [formerly d3affc909e299af8826d16bc02754fc61754e287]]]
Former-commit-id: 4888756560
Former-commit-id: e4da2bcb9c [formerly 71fe94b322]
Former-commit-id: 82513080ba
|
2012-02-16 12:51:24 -06:00 |
|
Ben Steffensmeier
|
2d4d4faf20
|
Issue #343 remove extra perspectives when in thinclient component
Change-Id: Ibb6cee8d10a541e2defac098e844c23798a1deee
Former-commit-id: 0104e1970d [formerly 28c7e6bc22] [formerly 0104e1970d [formerly 28c7e6bc22] [formerly 8cf7360e3b [formerly cb03ef54be5e9dae57d758903f6956a8c2a9a617]]]
Former-commit-id: 8cf7360e3b
Former-commit-id: 7de650c868 [formerly b819bfa8e9]
Former-commit-id: 1aff4d27fb
|
2012-02-15 17:10:34 -06:00 |
|
Steve Harris
|
de048d100b
|
Merge commit 'awips2_OB12.1.1_Omaha'
Former-commit-id: 296ce23f5f [formerly 2783331dd6] [formerly 296ce23f5f [formerly 2783331dd6] [formerly 1909537682 [formerly b1bce76fd8170d05e57624f969e5293c1257c533]]]
Former-commit-id: 1909537682
Former-commit-id: a2850d9280 [formerly 3c3eebfd0e]
Former-commit-id: 1771876628
|
2012-02-15 15:45:23 -06:00 |
|
Steve Harris
|
980a8569a1
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 5e2b2ddc22 [formerly 64b3ba9d2b] [formerly 5e2b2ddc22 [formerly 64b3ba9d2b] [formerly 09c3e613e5 [formerly 7b981a7bb3e35d9147bf686150e5ed91e5b22d79]]]
Former-commit-id: 09c3e613e5
Former-commit-id: 96c7c9acf8 [formerly 17c9ad4c0c]
Former-commit-id: 69dec3a5fa
|
2012-02-15 15:09:30 -06:00 |
|
Steve Harris
|
8e09b816da
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 68a5ebc0ad [formerly 272ba87883] [formerly 68a5ebc0ad [formerly 272ba87883] [formerly c1129dbd00 [formerly 14c8ac5618aa04da5408a1d75297f3f9fa19d023]]]
Former-commit-id: c1129dbd00
Former-commit-id: 4e6af98f5b [formerly ad402655f4]
Former-commit-id: c74ded15b9
|
2012-02-15 15:08:58 -06: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 |
|
Steve Harris
|
604b6c1f10
|
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 6aed9311a8 [formerly 7356d655da] [formerly 6aed9311a8 [formerly 7356d655da] [formerly 1707b98721 [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]]
Former-commit-id: 1707b98721
Former-commit-id: de85613a99 [formerly db1e3b1215]
Former-commit-id: a1462275f7
|
2012-02-15 14:34:47 -06:00 |
|
Steve Harris
|
4efa9fcbc3
|
Merge commit 'awips2_OB12.1.1_Omaha' into 10-Tech_Blocked
Former-commit-id: d84f7061f7 [formerly 05c0347d90] [formerly d84f7061f7 [formerly 05c0347d90] [formerly 86a0e3f5ee [formerly f83e2bd22a74e9604fb878a899d9a2df5fbb28eb]]]
Former-commit-id: 86a0e3f5ee
Former-commit-id: 780b0c9592 [formerly 72466ef0ca]
Former-commit-id: 28471f8e94
|
2012-02-15 14:26:22 -06:00 |
|
Steve Harris
|
79698247d7
|
Added the patch/bin directory and company to the installer.ldm for rpm builds
Former-commit-id: 74c156e508 [formerly 5e47f8c33a] [formerly 74c156e508 [formerly 5e47f8c33a] [formerly a91b01bfbe [formerly ab787c94408e85afe2d92c3f860b7b9bd271c616]]]
Former-commit-id: a91b01bfbe
Former-commit-id: 98b223d08e [formerly 39b13d7102]
Former-commit-id: ad1f608967
|
2012-02-15 12:54:54 -06:00 |
|
Bryan Kowal
|
b59b0ef8d5
|
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 2fabaff1d9 [formerly 38eb4bd2b6] [formerly 521756e57e [formerly 1dd23c4dea214938fe9660f303458c5f08efdc01]]]
Former-commit-id: 521756e57e
Former-commit-id: 134b8f2915 [formerly 1c023403e2]
Former-commit-id: e19d034858
|
2012-02-15 10:31:58 -06:00 |
|
Steve Harris
|
0d9992da14
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: 46dda7b8bd [formerly 2119a1513e] [formerly 46dda7b8bd [formerly 2119a1513e] [formerly 2e29bc8ee2 [formerly f70d42ad051ba56da8d8f28213b07c292e7f2549]]]
Former-commit-id: 2e29bc8ee2
Former-commit-id: d23d12d596 [formerly cb3371ee28]
Former-commit-id: dc9df63a11
|
2012-02-14 15:54:46 -06:00 |
|
Steve Harris
|
f37bc7d5e5
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 7911304736 [formerly 7a28b5ea62] [formerly 7911304736 [formerly 7a28b5ea62] [formerly 708348e9e4 [formerly 70f1516d0cc4dcd62214453974f1e65dd57d1ddd]]]
Former-commit-id: 708348e9e4
Former-commit-id: 77d083d6fa [formerly 6c719e6fc2]
Former-commit-id: e3832b4054
|
2012-02-14 15:47:32 -06:00 |
|
Ben Steffensmeier
|
16b7863b52
|
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: 808846e237 [formerly 944e59e989] [formerly 808846e237 [formerly 944e59e989] [formerly f65d86a06a [formerly 518db101f2ec18afa31a5b12fbaab3bbb903013b]]]
Former-commit-id: f65d86a06a
Former-commit-id: 993f2aafa4 [formerly d00572c122]
Former-commit-id: 800e674078
|
2012-02-14 15:46:11 -06:00 |
|
Steve Harris
|
06ccb964ed
|
Merge "Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client" into 4-Thin_Client
Former-commit-id: 1d7daf3576 [formerly 3973ed2360] [formerly 1d7daf3576 [formerly 3973ed2360] [formerly 376650ce9d [formerly e8e020e3bd86ffcd918366990d605acee8bd6a80]]]
Former-commit-id: 376650ce9d
Former-commit-id: 0b936af499 [formerly b847ef442c]
Former-commit-id: 2a2bffa947
|
2012-02-14 15:41:54 -06:00 |
|
Ben Steffensmeier
|
ff9c887e7e
|
Merge branch '4-Thin_Client' of ssh://lightning:29418/thunder into 4-Thin_Client
Change-Id: Ie77dfb768308e60cfd91fc75788a5b5905c7d1ce
Former-commit-id: 8561802d14 [formerly 97000f0738] [formerly 8561802d14 [formerly 97000f0738] [formerly b080ab8f6c [formerly 78deeca92b5916c7c57b1f866e9be2e11992c13d]]]
Former-commit-id: b080ab8f6c
Former-commit-id: ed952e100a [formerly 2e49f3b6aa]
Former-commit-id: cc173f99d2
|
2012-02-14 15:39:50 -06:00 |
|
Nate Jensen
|
11fa731db5
|
Merge "Issue #176 remove id from dataURI notifications" into 4-Thin_Client
Former-commit-id: 27c3458b5e [formerly daeda3f898] [formerly 27c3458b5e [formerly daeda3f898] [formerly dd7d200f7f [formerly 1135f27699b49795352ae5b1b31ac9fe06c564b6]]]
Former-commit-id: dd7d200f7f
Former-commit-id: b0819f7828 [formerly c49691bc7b]
Former-commit-id: 18671bb3e6
|
2012-02-14 13:06:27 -06:00 |
|
Ben Steffensmeier
|
4d0ddd50dc
|
Issue #176 remove id from dataURI notifications
Change-Id: I418de45a0daf13c9656161cc4ef67b755052ea58
Former-commit-id: e2141b574e [formerly 100b4c4ba0] [formerly e2141b574e [formerly 100b4c4ba0] [formerly 2995d2b29b [formerly 32b8f723ebf64d97636705911c0b7b22a9cd2148]]]
Former-commit-id: 2995d2b29b
Former-commit-id: 132f023a06 [formerly 7914496c96]
Former-commit-id: a8b2e65a7c
|
2012-02-14 12:59:42 -06:00 |
|
Greg Armendariz
|
8f60b4364b
|
Merge "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." into 4-Thin_Client
Former-commit-id: fd72f98fc2 [formerly cb16a5256a] [formerly fd72f98fc2 [formerly cb16a5256a] [formerly e3dda29720 [formerly 41ed9251ca6ef83a6de3362c52acaa21dd00da3d]]]
Former-commit-id: e3dda29720
Former-commit-id: 22b4dd70e8 [formerly 7ce17e1234]
Former-commit-id: 0793dc0853
|
2012-02-13 15:02:29 -06:00 |
|
Bryan Kowal
|
4ccdc365e1
|
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 c78e988d55 [formerly 67562b0674] [formerly 4faf9831ed [formerly de3970ed2c199ca0c2a6bdf9a7eaa3d0d0069122]]]
Former-commit-id: 4faf9831ed
Former-commit-id: 0bf4fecb62 [formerly eb91bb964e]
Former-commit-id: 0978aa5d1d
|
2012-02-13 13:57:10 -06:00 |
|
Nate Jensen
|
9fb2590b25
|
Merge "Issue #235 add an export menu to cave to handle screen capture, print, and displays" into 4-Thin_Client
Former-commit-id: 364cd8f5fc [formerly da7d13d933] [formerly 364cd8f5fc [formerly da7d13d933] [formerly 06327646d9 [formerly ad20627fab2fdcc0fdc45eb74e8c0e903009c4b9]]]
Former-commit-id: 06327646d9
Former-commit-id: ce7e58062c [formerly dd8500b081]
Former-commit-id: ab4ab01dd4
|
2012-02-13 11:40:36 -06:00 |
|
Bryan Kowal
|
d9096e1306
|
Issue #236 - ensure that all hs_err files are written to the user's "home directory" when CAVE crashes.
Former-commit-id: 8e552ca56f [formerly 34d9122f14] [formerly 8e552ca56f [formerly 34d9122f14] [formerly c77b9558e1 [formerly 00ce48c7698c9baad8a3ab643d39858c47c18226]]]
Former-commit-id: c77b9558e1
Former-commit-id: ef4218bdb0 [formerly 2c3f67d470]
Former-commit-id: e40f50ba36
|
2012-02-13 10:08:15 -06:00 |
|
Ben Steffensmeier
|
eaf930f7b8
|
Issue #235 add an export menu to cave to handle screen capture, print, and displays
Change-Id: I44656c7cbe8cb845250d228d13b0ba09ab7e5c98
Former-commit-id: 6e95175ba2 [formerly ebbbd0bafc] [formerly 6e95175ba2 [formerly ebbbd0bafc] [formerly f7985bff7b [formerly 622a02770dc84c8cedd9707b741f5f1e2b6ab81d]]]
Former-commit-id: f7985bff7b
Former-commit-id: 99557a2a0f [formerly a9e13fac26]
Former-commit-id: 7d16f12962
|
2012-02-10 12:13:34 -06:00 |
|
Bryan Kowal
|
3e8caa6467
|
Issue #202 - make edex-cots specs compatible with the branch.
Former-commit-id: a19dd6ff33 [formerly 7ca62dc7d6] [formerly a19dd6ff33 [formerly 7ca62dc7d6] [formerly 1855bbcbee [formerly 26243249e27ee347933748aa53e9436e32751d9c]]]
Former-commit-id: 1855bbcbee
Former-commit-id: 88b67b4977 [formerly 27c4557e0a]
Former-commit-id: 8cef173e1d
|
2012-02-09 12:14:37 -06:00 |
|
Bryan Kowal
|
8f5f890f0e
|
Issue #202 - fix deploy-install.
Former-commit-id: 8d76a78c47 [formerly 0a141d49d0] [formerly 8d76a78c47 [formerly 0a141d49d0] [formerly 23f61e0945 [formerly e591702f5c924e5e1ad2e335861867626a24fc2e]]]
Former-commit-id: 23f61e0945
Former-commit-id: 49f5a054e0 [formerly e85ed4a172]
Former-commit-id: 7dc74ad29a
|
2012-02-09 11:28:22 -06:00 |
|
Ben Steffensmeier
|
e50ddeed23
|
Issue #235 Added ability to capture multiple frames to NSharp
Change-Id: Ib6ab3acff6d9357679f4116493c1d3a97b57c2cc
Former-commit-id: 08e8343d98 [formerly 5cdcd5a261] [formerly 08e8343d98 [formerly 5cdcd5a261] [formerly 6bfd8ccfee [formerly 447253e7cd0ea5ab64c020a4fe0822ffc3a01d3f]]]
Former-commit-id: 6bfd8ccfee
Former-commit-id: 9d442083a1 [formerly 512e0f1bd5]
Former-commit-id: e1eeef7827
|
2012-02-09 10:54:02 -06:00 |
|
Bryan Kowal
|
01f7dcba36
|
Issue #202 - fix deploy-install.
Former-commit-id: 0953a705b3 [formerly 8a57a8ce05] [formerly 0953a705b3 [formerly 8a57a8ce05] [formerly 3060ca85cc [formerly e8f28b51b70eccdf19de2075a6c5c7efb9ccedda]]]
Former-commit-id: 3060ca85cc
Former-commit-id: 8219ef7ce6 [formerly b26d700ef4]
Former-commit-id: 928f6f8362
|
2012-02-09 10:41:46 -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 |
|
Steve Harris
|
de6357ada7
|
Merge branch '4-Thin_Client' into 104-integration
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 'created' to keep these files
Former-commit-id: e3b4b09cbe [formerly 37ca28aae8] [formerly e3b4b09cbe [formerly 37ca28aae8] [formerly d7e8c7fc26 [formerly ea128d2f4d9b676df50ef0d6727ff4f938f1c265]]]
Former-commit-id: d7e8c7fc26
Former-commit-id: be7c691383 [formerly 4b3c90acde]
Former-commit-id: 38ab2acab2
|
2012-02-09 08:53:53 -06:00 |
|
Ben Steffensmeier
|
8c5e58d181
|
Issue #245 only use a depth buffer for offscreen rendering if depth testing is enabled
Change-Id: I58fefef03829acf32db8b7c91b15983ba482d1b9
Former-commit-id: ddd5ee68ad [formerly 863fa0f635] [formerly ddd5ee68ad [formerly 863fa0f635] [formerly 3f60daa9c7 [formerly b7b3a581e8291313833b20da308f5adc5a234f26]]]
Former-commit-id: 3f60daa9c7
Former-commit-id: b09c00244e [formerly d49939ddb2]
Former-commit-id: 6164ad39b6
|
2012-02-08 16:29:02 -06:00 |
|
Steve Harris
|
a2cb228a73
|
Merge "Issue #192 gitignore changes" into ss_sync
Former-commit-id: ece695a374 [formerly 4eef9c3c20] [formerly ece695a374 [formerly 4eef9c3c20] [formerly 35cc62582b [formerly e019344c6f96c6db35ede5985779eab537df523c]]]
Former-commit-id: 35cc62582b
Former-commit-id: c2603de1b8 [formerly a6b95a2e81]
Former-commit-id: b1bab03dcb
|
2012-02-08 09:09:28 -06:00 |
|
Matt Nash
|
636d29c7bd
|
Merge "Issue #26 fix gage color for hydro to refresh" into 10-Tech_Blocked
Former-commit-id: ce5baf0632 [formerly e52a1315b2] [formerly ce5baf0632 [formerly e52a1315b2] [formerly 25b9659dc7 [formerly ac489b3dc676f7f202991906e0b004baa074dfe0]]]
Former-commit-id: 25b9659dc7
Former-commit-id: 6e11115195 [formerly 5c10b1d587]
Former-commit-id: bbb3cacd0d
|
2012-02-08 08:53:19 -06:00 |
|
Matt Nash
|
8c214b7de3
|
Issue #26 fix gage color for hydro to refresh
Former-commit-id: c4fee978d7 [formerly f7652d25e3] [formerly c4fee978d7 [formerly f7652d25e3] [formerly bb4f690393 [formerly 1a8d135e07c56e8ac202c01e7aa866290b28b0a4]]]
Former-commit-id: bb4f690393
Former-commit-id: d3433544ab [formerly 82089434e5]
Former-commit-id: 7ef7069905
|
2012-02-07 16:49:34 -06:00 |
|
Max Schenkelberg
|
2ee32f3112
|
Issue #206 fixed dialog context deactivation bug
Former-commit-id: d5369932fd [formerly 9535ae2d0e] [formerly d5369932fd [formerly 9535ae2d0e] [formerly fe59c3e8d8 [formerly b2b66e7483065e9677d8bd34f19b514c7914ef8c]]]
Former-commit-id: fe59c3e8d8
Former-commit-id: 0c4a9cf58a [formerly 9a7efcaae8]
Former-commit-id: e4fca4c6f7
|
2012-02-07 16:45:59 -06:00 |
|
Matt Nash
|
35ae21e179
|
Merge "Issue #206 - Fixed loading and disposing bugs in tear off menus" into 10-Tech_Blocked
Former-commit-id: 6fc771908f [formerly 81ec1d5dac] [formerly 6fc771908f [formerly 81ec1d5dac] [formerly be92a03f2d [formerly 65ce29e9b3721e7eef2a9ec842404252ead2d3ba]]]
Former-commit-id: be92a03f2d
Former-commit-id: 178663bd09 [formerly e629c0bc38]
Former-commit-id: 3fd575652b
|
2012-02-07 16:13:03 -06:00 |
|