xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2193 commits 31 branches 40 tags 3.8 GiB
Commit graph

1461 commits

Author SHA1 Message Date
Dustin Johnson
3c8e14edc7 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development 
Former-commit-id: bc323d3f25 [formerly 5b4035fb11] [formerly 8363eba409 [formerly 9761b41160000713d00113c5267badafc9613a0d]]
Former-commit-id: 8363eba409
Former-commit-id: e0b6e6187e
 2013-03-19 13:09:48 -05:00
Dave Hladky
618f737fab Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development! 
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: d7e8709cde [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly a52596494feb2255269513a3cd19490628d4ae10]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: f0244f54a4
 2013-03-19 13:08:14 -05:00
Bryan Kowal
fd68cd7a04 Issue #1805 - slightly modified viz feature build order 
Change-Id: I39da0557224a06f4d945ec496c8381bcf0197569

Former-commit-id: 6106369d4c [formerly f325038538] [formerly f0eb7d3285 [formerly 8c16b88062116de5e780471fc2f0415cb6dbedfe]]
Former-commit-id: f0eb7d3285
Former-commit-id: 54113e9b29
 2013-03-18 18:15:26 -05:00
Steve Harris
2a26783ba7 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
 2013-03-18 16:52:00 -05:00
Steve Harris
ea27f9cd17 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 27c418812f [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 5927ff20543395733d9302eba2e6772315730a80]]
Former-commit-id: c18b96dc4c
Former-commit-id: 245afb28c8
 2013-03-18 16:43:22 -05:00
Bryan Kowal
3e8d5449fc Issue #1741 - what was once two is now one 
- a single awips2-common-base rpm is now built for the com.raytheon.uf.common.base.feature feature
- this rpm will install the CAVE and/or EDEX artifacts


Former-commit-id: a93dcff1b5 [formerly b954bc17bf] [formerly 7fd035256d [formerly 99f92bf3c9e8c3e767ec25bc8fb370e53ec43f50]]
Former-commit-id: 7fd035256d
Former-commit-id: 66e2ed79ec
 2013-03-18 16:36:33 -05:00
Steve Harris
81a3f29afc 13.3.1-8 baseline 
Former-commit-id: bc9df0a8f9 [formerly f97d78994b] [formerly c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: c15b3ffe20
Former-commit-id: 5f492500ea
 2013-03-18 15:43:32 -05:00
Dustin Johnson
7afc4a083b Merge "Issue #1794 Consolidate common filename filters into FilenameFilters class" into development 
Former-commit-id: 36cc80590c [formerly b7a5311dde] [formerly 7fe3c254fd [formerly b131f5a534cf143b243c5748e450c09c6c72bdf3]]
Former-commit-id: 7fe3c254fd
Former-commit-id: 55095f0041
 2013-03-15 16:14:17 -05:00
Dustin Johnson
7adf94e9f6 Issue #1794 Consolidate common filename filters into FilenameFilters class 
Change-Id: I29d7267d79164e005e3c202a23267767c853bf36

Former-commit-id: fff7e7983f [formerly ecb0d2c826] [formerly 43a9f608ef [formerly 0e4c9f6ef22bf59f18ce3aab6539c52192539106]]
Former-commit-id: 43a9f608ef
Former-commit-id: 1b82ad0dc4
 2013-03-15 11:51:58 -05:00
Roger Ferrel
382bb7c16b Issue #1790 changes for non-blocking StationLegendDlg. 
Change-Id: Ie3d632cf8f1a6f0e85b3b4758afe236f3022e91d

Former-commit-id: dadf8a9e4c [formerly 0089e24579] [formerly b01bb935c3 [formerly 4ea3b9869a2e0d2c62d519b1fb32dc335b5e0ae0]]
Former-commit-id: b01bb935c3
Former-commit-id: 08990f97f8
 2013-03-15 10:26:30 -05:00
Roger Ferrel
e88e52e406 Issue #1790 changes for non-blocking StaffGageDlg. 
Change-Id: I37d1d2358a91b1f8720888543fb5e05d9ce55092

Former-commit-id: fcbda4e0de [formerly 4230e1a9b8] [formerly 17a41bf063 [formerly e9f07f25bd8064925eb9a387f2f8a79ddac15861]]
Former-commit-id: 17a41bf063
Former-commit-id: 006062502e
 2013-03-15 09:00:00 -05:00
Roger Ferrel
60e7b4be62 Issue #1790 changes for non-blocking PointPrecipAccumDlg and RiverSummaryDlg. 
Change-Id: I96e958225b32ba818743d69d77e6bb5cbdc5a13c

Former-commit-id: 76507ebcc5 [formerly 015fc9b8f8] [formerly 34ea46099e [formerly ad772f0a3eb944117614f029a2c3659e5c774599]]
Former-commit-id: 34ea46099e
Former-commit-id: 7eae71038f
 2013-03-15 08:17:50 -05:00
Lee Venable
ba4673b99a Merge "Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table" into omaha_13.3.1 
Former-commit-id: 57d7559797 [formerly 456fd056f4] [formerly 93e99b64a6 [formerly 9c65cd9c24baee752320ed21a60f6444ff3d9b5c]]
Former-commit-id: 93e99b64a6
Former-commit-id: 3a1dc41b50
 2013-03-14 17:19:38 -05:00
Dave Hladky
3ba473351b Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table 
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

Former-commit-id: a1c4148918 [formerly 9b495681ec] [formerly c57d5574ef [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]
Former-commit-id: c57d5574ef
Former-commit-id: db207a732c
 2013-03-14 15:59:39 -05:00
Roger Ferrel
46428ed944 Issue #1790 Changes for non-blocking TabularDisplayDlg. 
Change-Id: I38505da2d1c5a79e7b45579893845cc356a59a5d

Former-commit-id: 818b856f97 [formerly c43b7777e1] [formerly ebe57f1cbc [formerly 0466f5cf6c8114ff4b834869dab09ef567e8b192]]
Former-commit-id: ebe57f1cbc
Former-commit-id: ff944b4768
 2013-03-14 15:38:08 -05:00
Ron Anderson
97a38fd3c5 Merge "Issue #1793 Performance improvements for TCMWindTool Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e" into omaha_13.3.1 
Former-commit-id: 60af3ad63e [formerly 16d93dab84] [formerly fc749ff3eb [formerly 7abfd751fee0519c607e40d8188cefeb76061df5]]
Former-commit-id: fc749ff3eb
Former-commit-id: 7087e1ebe7
 2013-03-14 14:55:31 -05:00
Ben Steffensmeier
e5b9e0ca46 Issue #1793 Performance improvements for TCMWindTool 
Change-Id: I400f75fffe8f754ce2534b1320a81d6a455c890e

Former-commit-id: 7335a2336e [formerly 7aa8b2d3eb] [formerly 45a5cffdf3 [formerly 055873318a368301fc966501b27001f5ace0bcae]]
Former-commit-id: 45a5cffdf3
Former-commit-id: 364d6fd9ee
 2013-03-14 13:26:08 -05:00
Greg Armendariz
b79ecc28e3 Removed merge code from the source code 
Former-commit-id: 2bb407ea8b [formerly 5511f0b3a6] [formerly 2f9136843b [formerly 9652fe27ae424cba83296a714a720e554390550a]]
Former-commit-id: 2f9136843b
Former-commit-id: 3a3486b0b7
 2013-03-14 11:15:08 -05:00
Nate Jensen
e2e9a845d5 Merge "Issue #1792 Improve performance of gfe parm time weighted average. Change-Id: I139c873175ee1dbe29968c90e193701122abcead" into omaha_13.3.1 
Former-commit-id: 9dbb7660a7 [formerly 29b4cd2fb5] [formerly 490ffe2772 [formerly 086546a518276d519aca779d55c160f4f8bcd577]]
Former-commit-id: 490ffe2772
Former-commit-id: a933532ad9
 2013-03-14 09:48:16 -05:00
Roger Ferrel
3baa2e9220 Issue #1790 Changes for non-blocking PointDataControlDlg dialog. 
Change-Id: Icf7a2f8f890d20c8b92fa2ed82331cdfe3e23908

Former-commit-id: c556928998 [formerly dae3fb5938] [formerly 62b241a548 [formerly 930165c71745d13bd443afd71cf3b360a4c77fa5]]
Former-commit-id: 62b241a548
Former-commit-id: 09f4c18b5c
 2013-03-14 08:22:05 -05:00
Ben Steffensmeier
2d622e6053 Issue #1792 Improve performance of gfe parm time weighted average. 
Change-Id: I139c873175ee1dbe29968c90e193701122abcead

Former-commit-id: a9695abb45 [formerly 22624ba5d3] [formerly 52c167cf00 [formerly 61bdd593778588a18b91be3aa3af07ef28ca2412]]
Former-commit-id: 52c167cf00
Former-commit-id: 8f6a7c0746
 2013-03-13 18:52:52 -05:00
Ron Anderson
de14cd0baa Merge "Issue #1791 Implement bulk getGrids to improve performance. Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74" into omaha_13.3.1 
Former-commit-id: 0c881b4a85 [formerly 3b65608373] [formerly 61f74305e2 [formerly 437a30971b299965540d47f572ad83cd0d7df120]]
Former-commit-id: 61f74305e2
Former-commit-id: a7b6e1689b
 2013-03-13 17:16:37 -05:00
Ben Steffensmeier
f5680beaa9 Issue #1791 Implement bulk getGrids to improve performance. 
Change-Id: I13ed0e9c803444845c1b3a26600ec923fb7a6e74

Former-commit-id: 37bae0988b [formerly 4c150b0fd6] [formerly 89eb902284 [formerly 907f19c70cbfff4f8b266339967cedfbf9907c97]]
Former-commit-id: 89eb902284
Former-commit-id: 7abf3cfb39
 2013-03-13 17:09:20 -05:00
Dave Hladky
9e97fc9efe Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
 2013-03-13 13:56:33 -05:00
Steve Harris
ed5f1dbab6 13.3.1-7 baseline 
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
 2013-03-13 09:50:28 -05:00
Greg Armendariz
f121df7e86 Merge "Issue #1638 fix build" into development 
Former-commit-id: 28eec498f3 [formerly cc168cb94c] [formerly a06a730696 [formerly 9c0fe6bf68406ef7fbcf6b68888acb24dabb8fd9]]
Former-commit-id: a06a730696
Former-commit-id: 12e912c548
 2013-03-13 08:56:00 -05:00
Nate Jensen
5067a7b372 Issue #1638 fix build 
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e

Former-commit-id: 975d044ba6 [formerly 192fe9a724] [formerly 1cbc7bbfdc [formerly fe7a28034739ec871528f041cfa7a488e5c71378]]
Former-commit-id: 1cbc7bbfdc
Former-commit-id: 733186900f
 2013-03-13 08:50:26 -05:00
Dustin Johnson
f5a3b57107 Issue #1784 Move NCF bandwidth manager code to data delivery repo 
Amend:
  Publish JUnit test reports as XML, in support of Jenkins.
  Fix build/merge of 13.3.1 code so it compiles.

Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4

Former-commit-id: 2983ed29e4 [formerly 71365cd945] [formerly 1930183036 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]
Former-commit-id: 1930183036
Former-commit-id: 48a96911c8
 2013-03-13 08:39:08 -05:00
Nate Jensen
a4a5a1e94f Merge "Issue #1638 fix velocity on windows" into development 
Former-commit-id: 37d996c64c [formerly 4486bd9941] [formerly 676b3c9d11 [formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]
Former-commit-id: 676b3c9d11
Former-commit-id: 33f185d021
 2013-03-12 16:43:13 -05:00
Nate Jensen
35d0187e3d Issue #1638 fix velocity on windows 
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a

Former-commit-id: 5e545cc9c4 [formerly 863d4cf3df] [formerly cbf0343d72 [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]
Former-commit-id: cbf0343d72
Former-commit-id: b00ccd2b77
 2013-03-12 16:04:59 -05:00
Steve Harris
bca46a1354 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]
Former-commit-id: 0cd7e56e65
Former-commit-id: d5bcdb0015
 2013-03-12 16:04:23 -05:00
Dave Hladky
155903d135 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]
Former-commit-id: 4b08491880
Former-commit-id: 6ea95002de
 2013-03-12 15:48:34 -05:00
Mike Duff
a712efa614 Issue #1760 - fix minutes on the y axis of 3 hour graph 
Change-Id: I4f5f77d4307f69015ceade195270434e49198c69

Former-commit-id: a6eea1874b [formerly 714de645d5] [formerly 7040daf472 [formerly 1c1c34c7eec36f378cfd2969779f68f9a1de4159]]
Former-commit-id: 7040daf472
Former-commit-id: b5bccd0bb2
 2013-03-12 11:25:05 -05:00
Lee Venable
b471e3807f Merge "Issue #1781 - Fix Hydro Time Series slow table loads" into omaha_13.3.1 
Former-commit-id: 9a69cd3524 [formerly d5af1f02c5] [formerly 28d74d91b0 [formerly 1df2884be78544697f629fca8c7fd0d09ce78aac]]
Former-commit-id: 28d74d91b0
Former-commit-id: e080fb5106
 2013-03-12 09:08:44 -05:00
Mike Duff
2df046d409 Issue #1781 - Fix Hydro Time Series slow table loads 
Change-Id: Icc0b916459a6636d9571417d102c8ac0226fb93d

Former-commit-id: 492cf0f7e6 [formerly 6a6844fdaf] [formerly cac9bd6119 [formerly acb0a63e9bc71e815c321b6a5aacf8ac339a752a]]
Former-commit-id: cac9bd6119
Former-commit-id: caed059e23
 2013-03-12 09:03:08 -05:00
Steve Harris
6fe4b16924 13.3.1-6 baseline 
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 566b677d09
Former-commit-id: 4ed21b702b
 2013-03-12 08:35:45 -05:00
Roger Ferrel
0deb290c24 Issue #1780 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server. 
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: 70bd9aafa7 [formerly 4deb731bd0] [formerly b421c97d86 [formerly 225cb945e2008a56de323c7c01591ae27b3fd381]]
Former-commit-id: b421c97d86
Former-commit-id: 334f2c4a57
 2013-03-11 13:00:44 -05:00
Roger Ferrel
7e5bb824d9 Issue #1735 Changes for obtaining AvnFPS monitor's grid data for all sites in one call to the server. 
Code review changes 3.

Change-Id: I0cc7be0e219ab7874fa1a7f4cd8847d07e02724c

Former-commit-id: a73687c1b8 [formerly 6744238fce] [formerly 9e8472bab6 [formerly 42d3fc5c3eff4438b79f89fd7222682741eb470b]]
Former-commit-id: 9e8472bab6
Former-commit-id: 3684c7efed
 2013-03-11 11:16:22 -05:00
Dave Hladky
dd446abd03 Issue #1769 Crashing FFMP caused by thread wait 
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: 50696bee89 [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]
Former-commit-id: bb4c54eff0
Former-commit-id: 73c21a6ead
 2013-03-08 09:58:17 -06:00
Nate Jensen
c4175c161f Issue #1753 log on user shutdown 
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549

Former-commit-id: f101934a30 [formerly a7e9cfdb39] [formerly 163f93019b [formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]
Former-commit-id: 163f93019b
Former-commit-id: d6c3c84d30
 2013-03-06 09:36:00 -06:00
Jonathan Sanchez
234d73c905 Issue #1600 Created a utility class for adjust angles. 
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: 80ea3e1ec2 [formerly 8f70214f66] [formerly 6a3281c878 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]
Former-commit-id: 6a3281c878
Former-commit-id: c2b021427b
 2013-03-05 16:02:47 -06:00
Jonathan Sanchez
40f52ab049 Issue #1600 Created a utility class for adjust angles. 
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3

Former-commit-id: 3fface264c [formerly 1a91fe52e7] [formerly 1f2db32448 [formerly 14676fe089c0132febc3f533e6cbf2d00f117b90]]
Former-commit-id: 1f2db32448
Former-commit-id: 42bcef0be0
 2013-03-05 15:05:19 -06:00
Steve Harris
4a0b8772ec Merge branch 'omaha_13.3.1' into development 
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
 2013-03-05 12:29:44 -06:00
Steve Harris
b423579e4a Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1 
Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 57f42761d7
Former-commit-id: a8e1557c62
 2013-03-05 12:27:49 -06:00
Steve Harris
a240379588 13.3.1-5 baseline 
Former-commit-id: 8123d5ac45 [formerly a89221c75b] [formerly e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
 2013-03-05 10:47:06 -06:00
Steve Harris
3e0614b43a 13.3.1-4 baseline 
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
 2013-03-05 10:39:59 -06:00
Nate Jensen
3c5ca0546f Merge "Issue #1628 move xmx settings to linux so windows can override." into omaha_13.3.1 
Former-commit-id: b393674ef3 [formerly b803ae3801] [formerly a952d48b3e [formerly 20860d1a43d3a0f18bbe08a361c915cb7c8062b1]]
Former-commit-id: a952d48b3e
Former-commit-id: e3db522be4
 2013-03-05 09:10:52 -06:00
Richard Peter
a4bf42628a Merge "Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw." into omaha_13.3.1 
Former-commit-id: e74f6074e7 [formerly 070f62d08e] [formerly 784cd2145f [formerly 01d727795063ff365f3209f44c223c707c3942ab]]
Former-commit-id: 784cd2145f
Former-commit-id: 180540eb47
 2013-03-04 17:48:05 -06:00
Dave Hladky
0f3c9ba997 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw. 
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: 22ebfe0ecb [formerly 680317d9c4] [formerly fc36146f48 [formerly ef45479b067655db8203f199502ea4e772a80e34]]
Former-commit-id: fc36146f48
Former-commit-id: 1260b40307
 2013-03-04 17:41:11 -06:00
Ben Steffensmeier
c99a17709e Issue #1628 move xmx settings to linux so windows can override. 
Former-commit-id: 5a88604ed6 [formerly fad56e32cc] [formerly c1c5ac7926 [formerly 623433c2be19dd3b1419309704b7eb9a91c80f5d]]
Former-commit-id: c1c5ac7926
Former-commit-id: b16399cfdb
 2013-03-04 16:47:11 -06:00