Steve Harris
|
3a53c6453c
|
Merge branch 'ss_sync'
Former-commit-id: 507374d31d [formerly 9ef773822f] [formerly 507374d31d [formerly 9ef773822f] [formerly c81cfb72c6 [formerly 5ed747b42f001de0c6d08b5fb6f77a192f2e9a03]]]
Former-commit-id: c81cfb72c6
Former-commit-id: a90ad88b3c [formerly 546db2604a]
Former-commit-id: e5fdaad4fe
|
2012-02-23 13:32:19 -06:00 |
|
David Gillingham
|
ca09c3a75a
|
Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs.
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908
Former-commit-id: 5a8ba0f0fb [formerly 32b2c06988] [formerly 5a8ba0f0fb [formerly 32b2c06988] [formerly 85998bc654 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]
Former-commit-id: 85998bc654
Former-commit-id: 9ff631305a [formerly 88dcd4d09d]
Former-commit-id: 8e123e3ae0
|
2012-02-23 13:23:59 -06:00 |
|
Steve Harris
|
e639c21185
|
Merge branch '10-Tech_Blocked' into 104-integration
Former-commit-id: 6cab5a6709 [formerly eeddaa55f5] [formerly 6cab5a6709 [formerly eeddaa55f5] [formerly e829aa1a8b [formerly 72fce6fda1b07320cc79fbf8f09cc47ffbe32e89]]]
Former-commit-id: e829aa1a8b
Former-commit-id: 15facb4cf5 [formerly 48f081f798]
Former-commit-id: 190ebbc6a8
|
2012-02-23 13:18:50 -06:00 |
|
Steve Harris
|
db855932c5
|
Merge branch '4-Thin_Client' into 104-integration
Former-commit-id: db8491ee59 [formerly d6b489e69e] [formerly db8491ee59 [formerly d6b489e69e] [formerly 3b16f37675 [formerly fee006734577fd51f05ca5e9ce211d36d2b9fe57]]]
Former-commit-id: 3b16f37675
Former-commit-id: 4518d47393 [formerly 6f13b9c3b1]
Former-commit-id: 62e5b475da
|
2012-02-23 13:18:15 -06:00 |
|
Steve Harris
|
8ba0bf58ae
|
Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: d61c6bda96 [formerly f081d1a6d4] [formerly d61c6bda96 [formerly f081d1a6d4] [formerly a0063d6cb1 [formerly 5aa15dec35cf72a46288613e42e6cb02b94320a6]]]
Former-commit-id: a0063d6cb1
Former-commit-id: 62be9edb93 [formerly 4b1d072b46]
Former-commit-id: 0c7fa07eea
|
2012-02-23 13:17:26 -06:00 |
|
Steve Harris
|
034270857e
|
Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 608a0c17a0 [formerly f9baa1c98c] [formerly 608a0c17a0 [formerly f9baa1c98c] [formerly 46e1499e43 [formerly 2059372e90437312cf12f06de6c84d0824fb586c]]]
Former-commit-id: 46e1499e43
Former-commit-id: 63764220c4 [formerly 096ba6eb30]
Former-commit-id: 1328771113
|
2012-02-23 13:16:35 -06:00 |
|
Steve Harris
|
3433a1e31c
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: 07ac42866c [formerly c502603907] [formerly 07ac42866c [formerly c502603907] [formerly ecb38ba165 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]]
Former-commit-id: ecb38ba165
Former-commit-id: d83100c3df [formerly a9b900821a]
Former-commit-id: 32fa2a28c5
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
93d99ca49c
|
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 4981170462 [formerly dcadf7baa4] [formerly 4981170462 [formerly dcadf7baa4] [formerly 86e586befe [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]
Former-commit-id: 86e586befe
Former-commit-id: 4eb1ef5b0f [formerly 938dc5b21c]
Former-commit-id: 2c958713b6
|
2012-02-23 12:38:55 -06:00 |
|
Nate Jensen
|
a9a165f471
|
Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client
Former-commit-id: a914aa38c8 [formerly e3e44707a4] [formerly a914aa38c8 [formerly e3e44707a4] [formerly fef3fcb60c [formerly fd448c2a996aef215802dc501b68d28747f66414]]]
Former-commit-id: fef3fcb60c
Former-commit-id: e0e2a82d83 [formerly d03ff9824e]
Former-commit-id: 57c46aa9e1
|
2012-02-23 11:50:39 -06:00 |
|
Ben Steffensmeier
|
c77d5e6d98
|
Issue #176 update merged ncep plot classes to use new plot interface.
Change-Id: I345a970aa0d292fcd05ba4c19e77536e03057f72
Former-commit-id: 0b0047e29d [formerly 703d59a968] [formerly 0b0047e29d [formerly 703d59a968] [formerly 03d9230879 [formerly 2e22a794183e4be8758997b9e76f896917a761db]]]
Former-commit-id: 03d9230879
Former-commit-id: f048713c31 [formerly 6db9a03560]
Former-commit-id: af545548a1
|
2012-02-23 11:23:01 -06:00 |
|
Ben Steffensmeier
|
70cf1d2ad5
|
Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder.
Change-Id: I343e4e61d5f96938e84709392c32f6d94b244b17
Former-commit-id: a2db6975c9 [formerly 4dedc8b30d] [formerly a2db6975c9 [formerly 4dedc8b30d] [formerly 73a08e9d4e [formerly 951c8c2a77c8f58a04a576148ac583ccdcc21e02]]]
Former-commit-id: 73a08e9d4e
Former-commit-id: d937284ab2 [formerly d5d8697d9f]
Former-commit-id: 92962fdd2c
|
2012-02-23 10:49:56 -06:00 |
|
Steve Harris
|
c65a7faf1b
|
Merge branch 'ss_sync' into 10-Tech_Blocked
Former-commit-id: 9588895c2d [formerly 2d25ee9414] [formerly 9588895c2d [formerly 2d25ee9414] [formerly 19cf09274c [formerly a1b82aa2367ca506175ab0fec425c9e633ce949f]]]
Former-commit-id: 19cf09274c
Former-commit-id: b297f21344 [formerly 8afdef6680]
Former-commit-id: 24e057e722
|
2012-02-23 10:28:19 -06:00 |
|
Steve Harris
|
fd5ed23eb3
|
Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client
Former-commit-id: c0c0acfbe8 [formerly 957d232286] [formerly c0c0acfbe8 [formerly 957d232286] [formerly a82f2c5750 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]
Former-commit-id: a82f2c5750
Former-commit-id: 43b83ed8aa [formerly e6c3afa7a2]
Former-commit-id: 7f8343833e
|
2012-02-23 10:19:54 -06:00 |
|
Steve Harris
|
321a11e44c
|
Revert PlotResource2.java to ss_sync version for merge into 4-Thin_Client
Former-commit-id: a5f8708b6a [formerly db065fcd50] [formerly a5f8708b6a [formerly db065fcd50] [formerly e94b322dc3 [formerly 8a1ef8c6f0e3cdd8b4eb581218d499bc8fc19aeb]]]
Former-commit-id: e94b322dc3
Former-commit-id: 97184f1dc4 [formerly 78ea2de6d3]
Former-commit-id: 91ffb88ac7
|
2012-02-23 10:16:02 -06:00 |
|
Steve Harris
|
3aef320ffd
|
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 92084b3f20 [formerly d0bbbfefcc] [formerly 92084b3f20 [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 92b7072b82 [formerly 3d511fe719]
Former-commit-id: ae9c52b012
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
25167bb0eb
|
Merge branch 'OB12.2.1_test' into ss_sync
Former-commit-id: 7966ab9369 [formerly 6f7f678590] [formerly 7966ab9369 [formerly 6f7f678590] [formerly 830038b0c6 [formerly 76967f2151dcfb275be389c04060ff34be4a5018]]]
Former-commit-id: 830038b0c6
Former-commit-id: 1954443885 [formerly 5f6715ed05]
Former-commit-id: 3611ed97ca
|
2012-02-23 07:53:15 -06:00 |
|
Ben Steffensmeier
|
16d205ce9d
|
Issue #345 allow double dispose of GLTarget
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be
Former-commit-id: b776d953d7 [formerly 06c9d4cdcf] [formerly b776d953d7 [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]
Former-commit-id: 55aa66a510
Former-commit-id: c3d3142bab [formerly 5d6b036ed7]
Former-commit-id: 8f34946969
|
2012-02-22 17:40:48 -06:00 |
|
Bryan Kowal
|
27d2b69f2b
|
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
Former-commit-id: 0f02d05283 [formerly 9a63901c0e] [formerly 0f02d05283 [formerly 9a63901c0e] [formerly cd35220cf7 [formerly 979af119b4da4e99e0ee2f090b9c28c02db7f7a3]]]
Former-commit-id: cd35220cf7
Former-commit-id: 53f4674f25 [formerly 5ca7ce8373]
Former-commit-id: 012661cc90
|
2012-02-22 17:07:15 -06:00 |
|
Steve Harris
|
6c53f2425f
|
creating OB12.2.1 from ss_sync for testing
Former-commit-id: 4ff546d3fd [formerly a7b68a50be] [formerly 4ff546d3fd [formerly a7b68a50be] [formerly 1fc25c6cb2 [formerly 5ea9539870491d7ea3d1a050b700a17d18ecee1d]]]
Former-commit-id: 1fc25c6cb2
Former-commit-id: 83618ae62b [formerly aaf2fbd05b]
Former-commit-id: 5b11c36f19
|
2012-02-22 13:06:47 -06:00 |
|
Steve Harris
|
978d22db50
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]
Former-commit-id: 54be9660f1
Former-commit-id: b55a488ed8 [formerly 4450cf8963]
Former-commit-id: 15c56d11bc
|
2012-02-22 11:14:43 -06:00 |
|
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 |
|