Bryan Kowal
|
faa2bbda20
|
Issue #1181 - replace EnhancedPatternLayout with PatternLayout
Former-commit-id: cff13f2294 [formerly 9915d4c006 ] [formerly 77d12d0275 ] [formerly cff13f2294 [formerly 9915d4c006 ] [formerly 77d12d0275 ] [formerly 3a037ffd49 [formerly 77d12d0275 [formerly 29b131727eb8b5b9c450a7f0fd9d1c2c073cc393]]]]
Former-commit-id: 3a037ffd49
Former-commit-id: 0ab345e17f [formerly 9dc8747553 ] [formerly 87357daeaaf9ea2895f17d4854007267e21c00d1 [formerly f516e61f20 ]]
Former-commit-id: 1d8a42cac7558e4c00a06f158c06ba66408d14c0 [formerly 219c939169 ]
Former-commit-id: eaca9d0306
|
2012-09-14 12:25:41 -05:00 |
|
Nate Jensen
|
f8992cf603
|
Merge "Issue #1117: Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections." into development
Former-commit-id: 994e1080ad [formerly 71f5f75f22 ] [formerly b1a6ff5396 ] [formerly 994e1080ad [formerly 71f5f75f22 ] [formerly b1a6ff5396 ] [formerly 614c0f4248 [formerly b1a6ff5396 [formerly 31538baa1db02a946b2cec63e349025cd1f4676c]]]]
Former-commit-id: 614c0f4248
Former-commit-id: cc8aab9891 [formerly 9d873ef27d ] [formerly 3943d88976514d787846026cee72f4b8fd5026c0 [formerly e8ec45cb18 ]]
Former-commit-id: 20a66658a0f1c225247a4deeef18eb06ad9e4353 [formerly d7070a6ddf ]
Former-commit-id: f1f38899c8
|
2012-09-14 11:04:04 -05:00 |
|
Brad Gonzales
|
225f645494
|
Issue #1171 updated TimeSeriesDisplayCanvas.findGraphMinMax(GraphData) to check the latest only setting before including historical traces in the calculation. Replaced System.err logging in TimeSeriesDlg with UFStatus handler logging. Since show latest forcast is always checked initially by default, removed some changes that were unncessary.
Change-Id: I68f80d5c1ffff9993bb9e2fb870a89426dca15aa
Former-commit-id: f378cfec92 [formerly 3fc699002f ] [formerly f52f218813 ] [formerly f378cfec92 [formerly 3fc699002f ] [formerly f52f218813 ] [formerly 09abbee8e9 [formerly f52f218813 [formerly 8bb318d9e42e855ccaab60dc763b42040c098e3e]]]]
Former-commit-id: 09abbee8e9
Former-commit-id: 71f5d6cfe1 [formerly a23e190b3e ] [formerly 826ee862ba7b36f086579d0c9e39a99c4d22b01a [formerly 5552fe34a2 ]]
Former-commit-id: f10496364be54bb562722763f946745ce2658929 [formerly e8e07b3d59 ]
Former-commit-id: f2edc819fd
|
2012-09-14 10:56:28 -05:00 |
|
David Gillingham
|
9ed30526c3
|
Issue #1117: Fix WEBrowserDialog so that clicking on Source menu doesn't clear source selections.
Change-Id: I7341de07e986227f0917191626cdff8e25bafa30
Former-commit-id: 3b7e2b3627 [formerly f14efdfd7b ] [formerly cd1acff953 ] [formerly 3b7e2b3627 [formerly f14efdfd7b ] [formerly cd1acff953 ] [formerly a6d5f67f7a [formerly cd1acff953 [formerly 82a37521333d6cb471d9d770f99ba593a9ce76aa]]]]
Former-commit-id: a6d5f67f7a
Former-commit-id: b3f97a70b7 [formerly c7f3c50a35 ] [formerly 9eca90d25acea37355c1a256a17e5cbef460f23d [formerly 4a2ebe8218 ]]
Former-commit-id: abc42c9ef3b1e6c10c78648481828dac6e643d55 [formerly 9c0d31db01 ]
Former-commit-id: d8e181911e
|
2012-09-14 10:50:44 -05:00 |
|
Nate Jensen
|
f37499e98e
|
Merge "Issue #1172 - Corrected update problem" into development
Former-commit-id: e97b1fdbcc [formerly d24cc4440c ] [formerly 9daaa199ea ] [formerly e97b1fdbcc [formerly d24cc4440c ] [formerly 9daaa199ea ] [formerly 3ae061edf8 [formerly 9daaa199ea [formerly d04a01d963a40711e7ed78b0767b699adfd75b2b]]]]
Former-commit-id: 3ae061edf8
Former-commit-id: ae8d765d70 [formerly b6305cfea7 ] [formerly 3187bdf802622b7854951f5a746147c085575113 [formerly 7343b1a998 ]]
Former-commit-id: 8019f47553c72aa32edcd22a76282250b31deba7 [formerly 81699c719d ]
Former-commit-id: 0ced243e18
|
2012-09-14 10:42:59 -05:00 |
|
Nate Jensen
|
bf469fffbc
|
Merge "Issue #1147: for ifpIMAGE ensure map labels default to off." into development
Former-commit-id: f3a1b17c06 [formerly cda905ffaa ] [formerly 9fd69051eb ] [formerly f3a1b17c06 [formerly cda905ffaa ] [formerly 9fd69051eb ] [formerly 458900fe11 [formerly 9fd69051eb [formerly 1f4d435e4b7b3db480db0b8aa41505acd44170dc]]]]
Former-commit-id: 458900fe11
Former-commit-id: edfdcfff9e [formerly 8ca45fece4 ] [formerly a3e2de009b0f823f19954dbdbfa8dbe8bd870c61 [formerly c330ae0ee7 ]]
Former-commit-id: e813ec137872e896564b29a758b37f85eb5ea054 [formerly 869d7a72d7 ]
Former-commit-id: adafbdc660
|
2012-09-14 10:42:26 -05:00 |
|
Nate Jensen
|
7212cc8b71
|
Merge "Issue #1143 Fixed GriddedImageDisplay2 which is what the CWAT resource uses so stops incorrectly doubling the size of the short array used for display." into development
Former-commit-id: 483447405f [formerly 58c99f5249 ] [formerly ee4fa911a2 ] [formerly 483447405f [formerly 58c99f5249 ] [formerly ee4fa911a2 ] [formerly 935d47f612 [formerly ee4fa911a2 [formerly 0bd2709db5b336ce5fe215234ba780ff48dc595b]]]]
Former-commit-id: 935d47f612
Former-commit-id: d502608ad9 [formerly 33846f9d4c ] [formerly b424d82ebfee92328e15d2634cfb1d89c1a4fd0f [formerly 81fa37fe49 ]]
Former-commit-id: 0c2efdae4909eee91ec0e60d21f00850191e37cb [formerly 944b661bbe ]
Former-commit-id: 4aab36341d
|
2012-09-14 10:41:59 -05:00 |
|
David Gillingham
|
3df33f2697
|
Issue #1147: for ifpIMAGE ensure map labels default to off.
Change-Id: If0e8d0ec18374132469729d1bb2db9cf767afaea
Former-commit-id: 3508097a55 [formerly b56f800d33 ] [formerly f9f1b6981c ] [formerly 3508097a55 [formerly b56f800d33 ] [formerly f9f1b6981c ] [formerly 89ee494e1a [formerly f9f1b6981c [formerly d865ea8fc6dbe66e05ea7d7271df4b43a60f2146]]]]
Former-commit-id: 89ee494e1a
Former-commit-id: 26ea2b3cf7 [formerly 3825fa3e59 ] [formerly 9b90da8222c737d351f113f14876c3c95d3439d5 [formerly 45d3000fe2 ]]
Former-commit-id: b9f8d63698cf379bbe0ea7a2009a63717de353da [formerly b0e12df6af ]
Former-commit-id: 826b4ed24e
|
2012-09-14 10:08:01 -05:00 |
|
James Korman
|
fa876606dc
|
Issue #1172 - Corrected update problem
Change-Id: Id600728f8f9352b9c44c261c24bf1af8ae6c8e32
Former-commit-id: 60d3a92995 [formerly 26ed32cb19 ] [formerly c228b73624 ] [formerly 60d3a92995 [formerly 26ed32cb19 ] [formerly c228b73624 ] [formerly f0eafc3839 [formerly c228b73624 [formerly d436841050e4d96dbe3b3cb1e54a9d62525c5d08]]]]
Former-commit-id: f0eafc3839
Former-commit-id: 0e296ab1ba [formerly f90f5fadb1 ] [formerly 8d27acff59c764cb79fa7e930c179c5b01df9096 [formerly 5c79be21d8 ]]
Former-commit-id: 9eab975d1b9a27305ae92ca63c99cf1cc03d7039 [formerly 8bd924f6a5 ]
Former-commit-id: 97e31b6639
|
2012-09-14 09:46:08 -05:00 |
|
Lee Venable
|
16d5ce5ebd
|
Issue #1165 : initial update for the dialog refactor.
Issue #1165 - added JFACE code update.
Issue #1165 - changed method names.
Change-Id: I4fab0a7c1384a4f3e5f66a9daf90027d39421110
Former-commit-id: 5788991c34 [formerly 6ac7e90550 ] [formerly 045297e677 ] [formerly 5788991c34 [formerly 6ac7e90550 ] [formerly 045297e677 ] [formerly 14eb99add7 [formerly 045297e677 [formerly 687a13eb43abd6ff17b3aa82f2a0265159f5e6cc]]]]
Former-commit-id: 14eb99add7
Former-commit-id: 236e15e6bc [formerly 68d0ee976a ] [formerly a27ddb6856f05c1bdee33dfc8b324aa6f0223172 [formerly 9267113411 ]]
Former-commit-id: 1c499b4c7a6f60f40d973e283bd129133945fe27 [formerly 0a23610dee ]
Former-commit-id: 6875f14e23
|
2012-09-14 08:39:38 -05:00 |
|
Ron Anderson
|
6de33bf4c7
|
Merge "Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo XML files, modify ParameterInfo to provide list of valid levels for each parameter, create utility script to convert A1 CDL to A2 XML format, modify WeatherElementBrowser so database lists are always current." into development
Former-commit-id: 5b13a48b8d [formerly b628c604ad ] [formerly 5c844b346c ] [formerly 5b13a48b8d [formerly b628c604ad ] [formerly 5c844b346c ] [formerly 2dc48d6a85 [formerly 5c844b346c [formerly 5cc4ec7f99bb7e8d3185b4c5aa2b40f86125b618]]]]
Former-commit-id: 2dc48d6a85
Former-commit-id: e786fbb969 [formerly af643434d2 ] [formerly 706b88b9771f483b97eb04373e6514b7f649068e [formerly 558cfd51cb ]]
Former-commit-id: cfbcea7613200a091812e0ef1709f5ec8ba3ff1e [formerly 6dbf6c9c81 ]
Former-commit-id: 14dd12d24a
|
2012-09-13 17:41:14 -05:00 |
|
Max Schenkelberg
|
d90bc9b668
|
Issue #1143 Fixed GriddedImageDisplay2 which is what the CWAT resource uses so stops incorrectly doubling the size of the short array used for display.
Change-Id: I7fd59086fc75b7b72ebece857273c8d0c58d2abd
Former-commit-id: ac6c96dc4c [formerly dc613b2ba7 ] [formerly 2b20299319 ] [formerly ac6c96dc4c [formerly dc613b2ba7 ] [formerly 2b20299319 ] [formerly 0b361078b3 [formerly 2b20299319 [formerly 5698f8158b32789bab532e8820521f609e23a8c8]]]]
Former-commit-id: 0b361078b3
Former-commit-id: 0ff5dde0ba [formerly 18094f00ed ] [formerly 729af0e9bf1baa090cf92f33588ab1ef791a8ca6 [formerly 0fc001113f ]]
Former-commit-id: bbddac2d2e59d29ac53e73235d005f96152732fd [formerly d4b083d289 ]
Former-commit-id: 8c6a79a89f
|
2012-09-13 16:40:00 -05:00 |
|
Nate Jensen
|
5794d1a052
|
Merge "Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well." into development
Former-commit-id: 19bd82a901 [formerly 661ef69489 ] [formerly 5e9ef6a224 ] [formerly 19bd82a901 [formerly 661ef69489 ] [formerly 5e9ef6a224 ] [formerly 1af2344565 [formerly 5e9ef6a224 [formerly 00c4c7a84f65c5c8bb45d3d3020d97c5b9d16eba]]]]
Former-commit-id: 1af2344565
Former-commit-id: bca649279a [formerly 7c5c958074 ] [formerly 97f92a24042a4b1fa8729bd98b3f95a2a4da1d7f [formerly 99a6312ae0 ]]
Former-commit-id: f46e0fc79f9d360d442bae009500e5763266e630 [formerly c1d12f5b54 ]
Former-commit-id: 4a0294bd3d
|
2012-09-13 16:26:02 -05:00 |
|
David Gillingham
|
d10b8b964d
|
Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo
XML files, modify ParameterInfo to provide list of valid levels for each
parameter, create utility script to convert A1 CDL to A2 XML format,
modify WeatherElementBrowser so database lists are always current.
Change-Id: If0513ed8ce8c1134e92c6702c58b2a49f17a6dc5
Former-commit-id: 4d7f324f64 [formerly 03a202134a ] [formerly 21739d1d38 ] [formerly 4d7f324f64 [formerly 03a202134a ] [formerly 21739d1d38 ] [formerly 99ab0a124b [formerly 21739d1d38 [formerly 16048abdc9c03aafc11046c716aedce9dd44b92c]]]]
Former-commit-id: 99ab0a124b
Former-commit-id: a048dee4b3 [formerly 28ade875c5 ] [formerly cfc850e4fc58538a74d0f8c0490660cc9d30f0f8 [formerly 964927b19d ]]
Former-commit-id: da7d3be134a3c74fcdb1e41cda076543ccedbfc9 [formerly 527a457e55 ]
Former-commit-id: dcc5c7789d
|
2012-09-13 15:39:58 -05:00 |
|
Steve Harris
|
01248e7101
|
Merge branch 'development' into Enhanced_points
Former-commit-id: b84b354c01 [formerly 2e47ad78bc ] [formerly 321e2191b1 ] [formerly b84b354c01 [formerly 2e47ad78bc ] [formerly 321e2191b1 ] [formerly 6146f56ce4 [formerly 321e2191b1 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]]]
Former-commit-id: 6146f56ce4
Former-commit-id: 92bac7167a [formerly bc86013d8f ] [formerly 1519ecf79b5f70bd2a5878e760356c231a28383c [formerly 9ca736f901 ]]
Former-commit-id: 8426fe487b6ac801ec3e1fdc9e8591d2f018b9cf [formerly 69b6272658 ]
Former-commit-id: 40ddaa276f
|
2012-09-13 15:25:12 -05:00 |
|
Steve Harris
|
de8ec1b459
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 2a42503413 [formerly 9ae530cd1b ] [formerly abc2a7fb62 ] [formerly 2a42503413 [formerly 9ae530cd1b ] [formerly abc2a7fb62 ] [formerly da0afec2c1 [formerly abc2a7fb62 [formerly 165e2e8bfb9527ba1d5c274e351d63196eafa0e9]]]]
Former-commit-id: da0afec2c1
Former-commit-id: 65fc6b85b0 [formerly f4ed20ec4e ] [formerly ec0172ce05892299c83bf5ec5335a17b6abc84cd [formerly dcae36f2d7 ]]
Former-commit-id: 708c6e6667c214a6429bb58ffcd958102de053f3 [formerly e860b1ea6d ]
Former-commit-id: 42f2977019
|
2012-09-13 15:21:40 -05:00 |
|
Max Schenkelberg
|
3d478f934f
|
Issue #1170 Changed WorldWrapCorrector to take into account interior rings in polygons and world wrap correct them as well.
Change-Id: I4756cffb310ba9c7eab707b3764f667db01f886f
Former-commit-id: 587b5bacc0 [formerly 3cdabeb7cd ] [formerly 5a9d7eea35 ] [formerly 587b5bacc0 [formerly 3cdabeb7cd ] [formerly 5a9d7eea35 ] [formerly 932e4da3a9 [formerly 5a9d7eea35 [formerly ac26e6f39bc21ecb4b2bd13a20f72d4f4c470e67]]]]
Former-commit-id: 932e4da3a9
Former-commit-id: 38c1f1bb52 [formerly 78348fd355 ] [formerly 8053cdf94bff1afc4a5eb26c0e3e4653e80c2fb3 [formerly e6ca7b1122 ]]
Former-commit-id: f22eb8101a72b4259667d42f478522cd36a0f62c [formerly 3962f6b156 ]
Former-commit-id: 2caf54f9d3
|
2012-09-13 14:37:20 -05:00 |
|
Brad Gonzales
|
e4e96327f0
|
Issue #1158 Changed the scheduled and alerted alarm containers in SCANAlarmAlertManager to be sychronized. Changed the alarm button and alarm in SCANCellTableDlg to show and alarm only when the current table has alarms. Turn off alarms if the threshold has changed. Also a fix for ScanResource to initialize the ScanDrawer only after it has initialized the GeodeticCalculator.
Former-commit-id: 0750f76993 [formerly 49f61f42f1 ] [formerly 02ca1776b4 ] [formerly 0750f76993 [formerly 49f61f42f1 ] [formerly 02ca1776b4 ] [formerly 1ed32bdefc [formerly 02ca1776b4 [formerly e1f97dfdf69c0cf625555372e8855d85967c4b2a]]]]
Former-commit-id: 1ed32bdefc
Former-commit-id: 9575ce37d2 [formerly c34cdda42f ] [formerly af9bbfb5aa58b854fab891b292d963e9ec66cad2 [formerly 88d9115db9 ]]
Former-commit-id: d587191e75e38d5c93e25ec02a38f42309887bb7 [formerly 10ddb22854 ]
Former-commit-id: 3fab94cf35
|
2012-09-13 14:20:23 -05:00 |
|
Steve Harris
|
12c59e82df
|
Merge branch 'ss_builds' (12.10.1-4) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: bedc9569ca [formerly 04de1d5857 ] [formerly 29e7427dc3 ] [formerly bedc9569ca [formerly 04de1d5857 ] [formerly 29e7427dc3 ] [formerly 04d9735c8f [formerly 29e7427dc3 [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]]]
Former-commit-id: 04d9735c8f
Former-commit-id: 9d1f595fe6 [formerly e23b030dfd ] [formerly 9191d8c6cfa1f6e0cfae44b8ecd803bd00e75cc9 [formerly 53673f63e6 ]]
Former-commit-id: bd0ee0b429fad620ecf3eac1dfa68366ef64350e [formerly f80fb62837 ]
Former-commit-id: 30b0700044
|
2012-09-13 13:26:13 -05:00 |
|
Steve Harris
|
ed04125cd7
|
12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c ] [formerly fd19ca5624 ] [formerly 0d8d18d7e2 [formerly e38e81ab8c ] [formerly fd19ca5624 ] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5 ] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576 ]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec ]
Former-commit-id: e57e7237a9
|
2012-09-13 12:08:11 -05:00 |
|
James Korman
|
42a67b10de
|
Issue #1011 - Corrected AIREP turbulence decoding
Change-Id: Ie56a2b916df7b68f28cca73235f33596b903c5b1
Former-commit-id: 972d96fe33 [formerly 6531df3ab0 ] [formerly c0e5570aa2 ] [formerly 972d96fe33 [formerly 6531df3ab0 ] [formerly c0e5570aa2 ] [formerly d3fd8a53df [formerly c0e5570aa2 [formerly 41dd04864bbd4b510b5e1b0c6e4259bb140b9b2e]]]]
Former-commit-id: d3fd8a53df
Former-commit-id: a5bc971db4 [formerly 2241841dcd ] [formerly a836538e0d3617f5215a978ca16aab21016c1d40 [formerly 029f9537c8 ]]
Former-commit-id: 95e331224aaa35bb86bde1956d0fe600d48a143f [formerly a58854cd36 ]
Former-commit-id: be6c142d24
|
2012-09-13 10:18:39 -05:00 |
|
Richard Peter
|
57f89b265d
|
Merge "Issue #951 added Appender EnvConfigurableRollingFileAppender." into development
Former-commit-id: fc1e536f99 [formerly 89b376611f ] [formerly 01f8febfd5 ] [formerly fc1e536f99 [formerly 89b376611f ] [formerly 01f8febfd5 ] [formerly cc479cccc5 [formerly 01f8febfd5 [formerly 028d3984932a79fbdf290c9bf53971cf31f11ff8]]]]
Former-commit-id: cc479cccc5
Former-commit-id: 41f59ada35 [formerly b93815fefd ] [formerly bc067e1760c89a61d247dec01d3115baef46f106 [formerly 7d61eaccf7 ]]
Former-commit-id: 9fb4ba71be5337939a7334bf27419feeead22224 [formerly e4539af9a2 ]
Former-commit-id: 963bb6170e
|
2012-09-13 09:36:14 -05:00 |
|
Roger Ferrel
|
2a5bbcd49c
|
Issue #1155 Per email changed default id from 'blank' to hyphen '-'.
Change-Id: Iea2dcb2ecb15662d158c93a6e81989335860e581
Former-commit-id: 0743085c57 [formerly 6ceebcc2ee ] [formerly c1315ae6f5 ] [formerly 0743085c57 [formerly 6ceebcc2ee ] [formerly c1315ae6f5 ] [formerly 412337bc42 [formerly c1315ae6f5 [formerly 993c0cf0eb9e31b1aa1ffa339d49e323571aaa1b]]]]
Former-commit-id: 412337bc42
Former-commit-id: 508ad5117c [formerly 8add761edb ] [formerly 5e5b15081d7d9a2ffd400340bab454e61a8d2401 [formerly f5347f2373 ]]
Former-commit-id: e275fe18c650af325ec48268619ad7e03d17423b [formerly 7b97c64025 ]
Former-commit-id: fb6942dc3b
|
2012-09-13 08:23:00 -05:00 |
|
Brad Gonzales
|
314039d80b
|
Issue #951 added Appender EnvConfigurableRollingFileAppender.
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b
Former-commit-id: b384c8372b [formerly 32df328434 ] [formerly 4b383c3274 ] [formerly b384c8372b [formerly 32df328434 ] [formerly 4b383c3274 ] [formerly d10cabc917 [formerly 4b383c3274 [formerly 4d103fe06c94b8d5067e44aaabfdac88347f9a96]]]]
Former-commit-id: d10cabc917
Former-commit-id: 05314b8677 [formerly 2ea4005704 ] [formerly 843e55a046283daa44610ca5e1825fc4341a5d8c [formerly 41dc92ba3a ]]
Former-commit-id: 90626b830e47e9f701dbe0bcb7f2187920d0838d [formerly b9937ef456 ]
Former-commit-id: f4e27386cd
|
2012-09-13 07:50:56 -05:00 |
|
Nate Jensen
|
3c55680a39
|
Merge "Issue #875 Now does faster refresh and properly handle nofification of other CAVEs of changes." into Enhanced_points
Former-commit-id: bed0deac22 [formerly 0d2a6afbaf ] [formerly 60c1c059c6 ] [formerly bed0deac22 [formerly 0d2a6afbaf ] [formerly 60c1c059c6 ] [formerly b5309d2484 [formerly 60c1c059c6 [formerly d03287982238676b7f7f76cf1ff4e1404e66f038]]]]
Former-commit-id: b5309d2484
Former-commit-id: 9217868a4d [formerly 40d8ecacd4 ] [formerly 349fbcae967a5ebe66c180fbe663a9eb3245a21f [formerly 02453bf3e8 ]]
Former-commit-id: 1812f69df37ef28228a0d02fef85bcd156b8745c [formerly 08bd26f2a1 ]
Former-commit-id: 2792abbdaf
|
2012-09-12 15:04:58 -05:00 |
|
Roger Ferrel
|
773136c54f
|
Issue #1155 changed default WMO id to 'blank'.
Change-Id: I1374b7584545e1510745882972e96011fd6db128
Former-commit-id: 758b90b2b3 [formerly 65b8cd58c3 ] [formerly d61f796f31 ] [formerly 758b90b2b3 [formerly 65b8cd58c3 ] [formerly d61f796f31 ] [formerly 00d7dea2eb [formerly d61f796f31 [formerly c68617688bebf943fba3f46ab4df200ee4f99cc8]]]]
Former-commit-id: 00d7dea2eb
Former-commit-id: 63725482a3 [formerly 1b76eec288 ] [formerly 610f75dddcd8f45283a33719f385e68b0ff42391 [formerly c6bbd04898 ]]
Former-commit-id: 9eeb2a2a1496fcdf0a51793d3211a8d4acf9af22 [formerly 789e5f513d ]
Former-commit-id: 731fcd6f3c
|
2012-09-12 14:55:15 -05:00 |
|
Steve Harris
|
5b45d94813
|
Merge branch 'development' into Enhanced_points
Former-commit-id: bb6fe85a47 [formerly 892598dc66 ] [formerly 1dd1305a5d ] [formerly bb6fe85a47 [formerly 892598dc66 ] [formerly 1dd1305a5d ] [formerly ada1066831 [formerly 1dd1305a5d [formerly 632a766ec44337156bab8df73aecdee8b7bc2853]]]]
Former-commit-id: ada1066831
Former-commit-id: 0f90ce8b04 [formerly e0ee6bbf96 ] [formerly ad082c7958881e97fce6af73febade39a438deb1 [formerly d85659d9de ]]
Former-commit-id: 5c4e50ab82874e05d162915d324435e735821222 [formerly d20a1de861 ]
Former-commit-id: 73b1005512
|
2012-09-12 14:14:56 -05:00 |
|
Steve Harris
|
7a4eb9bf41
|
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: bbc20f4a68 [formerly 22dac5c82e ] [formerly 077ced354e ] [formerly bbc20f4a68 [formerly 22dac5c82e ] [formerly 077ced354e ] [formerly fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]]
Former-commit-id: fd5e214e72
Former-commit-id: 11421048fb [formerly 9f3bd0d4ec ] [formerly bdf8cbe13f96fe312d8ad014285d113e04c8d85a [formerly ba25027ea5 ]]
Former-commit-id: 669f728964989299c9646d57fbe148142a246f5f [formerly 2002a7cb8d ]
Former-commit-id: 6ce314ca65
|
2012-09-12 13:10:36 -05:00 |
|
Nate Jensen
|
8648c59a64
|
Merge "Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed." into development
Former-commit-id: 761795bbae [formerly 3c240d3269 ] [formerly 89fb0a5bee ] [formerly 761795bbae [formerly 3c240d3269 ] [formerly 89fb0a5bee ] [formerly bb68c93607 [formerly 89fb0a5bee [formerly 9b20aae000c7d4ac25dada94390eb3e8d70a6cc9]]]]
Former-commit-id: bb68c93607
Former-commit-id: 43c2ee4358 [formerly 4f457a34b9 ] [formerly 7b464ea25fc9ce3602bc4d975dce3f84fbefe8f3 [formerly 50c95b06f9 ]]
Former-commit-id: 09d667a8dc119e82e7596885f962ae423621fa14 [formerly 5b6f330da6 ]
Former-commit-id: 89447077ee
|
2012-09-12 09:18:24 -05:00 |
|
Roger Ferrel
|
6c2ffb654d
|
Issue #875 Now does faster refresh and properly handle nofification of other CAVEs of changes.
Amend: Changes from code review
Change-Id: I556174de78c98730cabcd194b657db55328cf551
Former-commit-id: fa4d4e0ff8 [formerly 5b320fe49d ] [formerly 6df929a87d ] [formerly fa4d4e0ff8 [formerly 5b320fe49d ] [formerly 6df929a87d ] [formerly be8e334da3 [formerly 6df929a87d [formerly ae352e695a198b4f675249d1ef22118305d2f682]]]]
Former-commit-id: be8e334da3
Former-commit-id: 5070a3b22c [formerly e8675be231 ] [formerly 509780471409fb7e4558715d54c4c9137c2dfc08 [formerly 8b4e7346a6 ]]
Former-commit-id: 7b54f1018f34ceec8cf0fc0f2783685d8caca306 [formerly c276743760 ]
Former-commit-id: 4c60f31617
|
2012-09-12 09:00:33 -05:00 |
|
Steve Harris
|
e78abbb503
|
Merge branch 'ss_builds' (12.10.1-3) into development
Conflicts:
cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
cave/com.raytheon.uf.viz.kml.export.feature/build.properties
cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment
Former-commit-id: 2f57e328fe [formerly f94db138cd ] [formerly 64d4e2bded ] [formerly 2f57e328fe [formerly f94db138cd ] [formerly 64d4e2bded ] [formerly 012c526816 [formerly 64d4e2bded [formerly e4e12a182b674b136c2753e3fd2f79a3a338ebee]]]]
Former-commit-id: 012c526816
Former-commit-id: 047003d8c0 [formerly b14d30591b ] [formerly bf5ba423a5556426548660494a7905779f996b28 [formerly 41c82361f7 ]]
Former-commit-id: 585e00c89332757d4df66cf4a92879c20bf9d63b [formerly bba73380ca ]
Former-commit-id: 3bec22460f
|
2012-09-11 16:57:03 -05:00 |
|
Max Schenkelberg
|
6b5b4197a0
|
Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d
Former-commit-id: 5e94274b98 [formerly a6cc869ada ] [formerly 7294025e26 ] [formerly 5e94274b98 [formerly a6cc869ada ] [formerly 7294025e26 ] [formerly 2f8f1ce9b2 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: 1e81c703f1 [formerly 52e812ec0e ] [formerly 879019359ad23ac206937c8d749c606eda7eac91 [formerly c26d21d908 ]]
Former-commit-id: 0f1fad1da8c7a5d1787cda72eb269efb5b9cde6d [formerly 1badd11cdb ]
Former-commit-id: fbc35a39d4
|
2012-09-11 16:27:41 -05:00 |
|
Steve Harris
|
9d4e230e7a
|
12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2 ] [formerly 21f430062b ] [formerly 0403e7d0a9 [formerly de1639aea2 ] [formerly 21f430062b ] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db ] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd ]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529 ]
Former-commit-id: 5030894212
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
4ccea19158
|
12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d ] [formerly 250f0ccac9 ] [formerly bb190a66a1 [formerly dde1f4c54d ] [formerly 250f0ccac9 ] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5 ] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d ]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee ]
Former-commit-id: 5684a84a46
|
2012-09-11 15:50:57 -05:00 |
|
Nate Jensen
|
bc128f06d5
|
Issue #1096 fixed sampling order
Change-Id: Ib5fa01c281a50f792abc6a813167455c51076bed
Former-commit-id: a6252ceab2 [formerly cb9dd60490 ] [formerly c6b07f3672 ] [formerly a6252ceab2 [formerly cb9dd60490 ] [formerly c6b07f3672 ] [formerly d58af3e377 [formerly c6b07f3672 [formerly 6274438941aef5d7e5ee284488ffe0300ee3a68e]]]]
Former-commit-id: d58af3e377
Former-commit-id: f4f6bca08c [formerly a899727652 ] [formerly 5fc5d72098aba57eb9f63c4a45e92548e73e8693 [formerly 54cf5ebca4 ]]
Former-commit-id: 526d69e4bf8f77d976294db2206c0218bb3eeda0 [formerly d0ba18435c ]
Former-commit-id: 346b652757
|
2012-09-11 13:11:23 -05:00 |
|
Lee Venable
|
3835e1f717
|
Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
Former-commit-id: c1d6d8e77a [formerly 1f86d2c4ba ] [formerly 056e74d3cf ] [formerly c1d6d8e77a [formerly 1f86d2c4ba ] [formerly 056e74d3cf ] [formerly 83fc018f38 [formerly 056e74d3cf [formerly 19dc13a0d5ef2b0fc41300815dd6be34d7001afd]]]]
Former-commit-id: 83fc018f38
Former-commit-id: b921d8300c [formerly 782593a118 ] [formerly fe0be8190662c7e6d90a9853e2d5697ccd2f90f4 [formerly 1d0bdbd25c ]]
Former-commit-id: 6767a793ca7535fee22938818e5325edd17c7876 [formerly 83c441319e ]
Former-commit-id: 4d0edf403e
|
2012-09-11 09:15:47 -05:00 |
|
Nate Jensen
|
43c79a395f
|
Merge "Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view." into development
Former-commit-id: bdbaa71575 [formerly 4d91b0a15a ] [formerly e61076b316 ] [formerly bdbaa71575 [formerly 4d91b0a15a ] [formerly e61076b316 ] [formerly 7c1bc79df7 [formerly e61076b316 [formerly 603632fbca6e67b9e1f3cd1f4a48026bca3f1f35]]]]
Former-commit-id: 7c1bc79df7
Former-commit-id: b859c18e1d [formerly 8d36456626 ] [formerly 86d8f9d6ef7dbf4b9521438792e20b0557afe5bb [formerly cc8fae1099 ]]
Former-commit-id: 52b0af166acbed3fa71101f1c5cb0e6a94744242 [formerly ab3f9e7847 ]
Former-commit-id: 8c89211dd7
|
2012-09-11 09:06:26 -05:00 |
|
Dave Hladky
|
b1ad95f547
|
Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
Change-Id: I23212f3281290d86621e72c88478b00d37336494
Former-commit-id: 7ea2655805 [formerly 33f222783d ] [formerly 28912552fe ] [formerly 7ea2655805 [formerly 33f222783d ] [formerly 28912552fe ] [formerly 6818408d40 [formerly 28912552fe [formerly 2088328c090d5a7d3f6218c42619fd3ab6d45dd9]]]]
Former-commit-id: 6818408d40
Former-commit-id: 566007c438 [formerly 02b00ddf47 ] [formerly 5f94e8ba51158c8fb39f7777f808e5c34c42b933 [formerly 655939bba7 ]]
Former-commit-id: a858f48eb5eeb7dd341dfe161a1c1d50ab169f85 [formerly 8f3447ff9b ]
Former-commit-id: 2114682424
|
2012-09-11 08:56:51 -05:00 |
|
Mike Duff
|
e09895120e
|
Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
Former-commit-id: 4180c20fbe [formerly 269d2831d9 ] [formerly bcafd807c5 ] [formerly 4180c20fbe [formerly 269d2831d9 ] [formerly bcafd807c5 ] [formerly 7825863940 [formerly bcafd807c5 [formerly 5504abfd272649dad36357ae7fdce83c75b3e3fa]]]]
Former-commit-id: 7825863940
Former-commit-id: 4a392f3a7e [formerly e443d5b5da ] [formerly a8d4d5f0957d84bdc382ed4bc60b15cf3078cc0b [formerly db6ac1594e ]]
Former-commit-id: 285bdfa5c621f5bfca306fe69d8dae2bae78fac0 [formerly 45e84531a6 ]
Former-commit-id: 195e71243f
|
2012-09-11 08:50:55 -05:00 |
|
Jonathan Sanchez
|
b0dd12e275
|
Issue #1006 fix supdirs
Former-commit-id: 6e1be0b967 [formerly d2f4487543 ] [formerly 09bdc765e5 ] [formerly 6e1be0b967 [formerly d2f4487543 ] [formerly 09bdc765e5 ] [formerly 44d21bfe36 [formerly 09bdc765e5 [formerly 09109d26f68e527f843013883dc7f3082f01dd7a]]]]
Former-commit-id: 44d21bfe36
Former-commit-id: 9230cfe187 [formerly f66eebab84 ] [formerly 75b68cce3258bf1f21ee4af293ccac45fc294059 [formerly b048808367 ]]
Former-commit-id: 14cdfa18531268a65a732b1c338c3255cfcc4ab9 [formerly ec0294864a ]
Former-commit-id: 5a0abaaa9e
|
2012-09-10 17:39:36 -05:00 |
|
Lee Venable
|
00b32ea829
|
Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
Former-commit-id: 97a9c87490 [formerly 8f95f21e6a ] [formerly b22bd12fad ] [formerly 97a9c87490 [formerly 8f95f21e6a ] [formerly b22bd12fad ] [formerly 903c220ecb [formerly b22bd12fad [formerly bacccfd683e71eab49c69d815aafbef2e395e863]]]]
Former-commit-id: 903c220ecb
Former-commit-id: 94a11a269b [formerly 9d55815fcf ] [formerly 88289ac2565a1212c88972cd22af916ab8d4a31f [formerly f1a836d0bb ]]
Former-commit-id: 8e4e01abeb0e8b4a68c2e9bb3f92e5eeaf6c5f61 [formerly ef57279c96 ]
Former-commit-id: 8272ed7387
|
2012-09-10 15:13:47 -05:00 |
|
Roger Ferrel
|
2cc43fc135
|
Issue #1159 No longer wrap text pasted to empty text field.
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d
Former-commit-id: 915ded00c4 [formerly fd1be035c3 ] [formerly ef9634dd96 ] [formerly 915ded00c4 [formerly fd1be035c3 ] [formerly ef9634dd96 ] [formerly e55c9ca0bd [formerly ef9634dd96 [formerly 0b418dc248fd3c2107f2d6c045c8da51f13f1faa]]]]
Former-commit-id: e55c9ca0bd
Former-commit-id: 15e9098529 [formerly 37cffe02b0 ] [formerly 61d473c04e628e251b126bfe9027d6acb028b5ac [formerly aa036adf6d ]]
Former-commit-id: e90c01cff6deebb1103ae3eac9b395e981a0c612 [formerly d9e4fdb6a3 ]
Former-commit-id: c77a82828b
|
2012-09-10 13:25:29 -05:00 |
|
Max Schenkelberg
|
376809e2b4
|
Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536
Former-commit-id: f7abe9ee39 [formerly 6d78afd423 ] [formerly 80439b309b ] [formerly f7abe9ee39 [formerly 6d78afd423 ] [formerly 80439b309b ] [formerly 84658dd03a [formerly 80439b309b [formerly 1d5b8912fe38bd21496c7b9f4ba385e27d7dedcd]]]]
Former-commit-id: 84658dd03a
Former-commit-id: 827ef7301b [formerly d2d74fac20 ] [formerly f9f8eef104b9eb8e02ca5321a8ca3396d4878105 [formerly 20f5d966db ]]
Former-commit-id: 9672b8f584873397fefa3457c0a7bc7d4ea457b1 [formerly 264bc403d6 ]
Former-commit-id: 29ab00a4cb
|
2012-09-10 10:45:37 -05:00 |
|
Brad Gonzales
|
a2d47dee93
|
Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
Former-commit-id: 87def306af [formerly 85961a3d6d ] [formerly f2b97d3170 ] [formerly 87def306af [formerly 85961a3d6d ] [formerly f2b97d3170 ] [formerly 1b028a6d54 [formerly f2b97d3170 [formerly ecbe261f768452fc30a6641d25f5303565d18cbb]]]]
Former-commit-id: 1b028a6d54
Former-commit-id: 39b0c07947 [formerly edaaac843d ] [formerly 74336a520ae88be3f8fbe7ecc497a8bb4f6942fd [formerly b7c9603d02 ]]
Former-commit-id: ab94e966d12a1332b65d12e68f6d6d66355aac0e [formerly 283f084c28 ]
Former-commit-id: e75a25b118
|
2012-09-10 09:24:28 -05:00 |
|
Roger Ferrel
|
e5427ade0d
|
Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377
Former-commit-id: 2a34cf0ac2 [formerly 3de56714fb ] [formerly ce5430a625 ] [formerly 2a34cf0ac2 [formerly 3de56714fb ] [formerly ce5430a625 ] [formerly caff5053cb [formerly ce5430a625 [formerly 8506d363eff80306d0413e942c52d90b977ea887]]]]
Former-commit-id: caff5053cb
Former-commit-id: 6a6f27bd44 [formerly 8926d7a65b ] [formerly 168a71f817820a049f75d0c76d54e15faab80e00 [formerly b287d102a7 ]]
Former-commit-id: 521236215f2f1f2db37e38ed178527cb29a58dfd [formerly dfc3f135ef ]
Former-commit-id: be580ea44c
|
2012-09-10 08:28:58 -05:00 |
|
Ron Anderson
|
a457539c80
|
Issue #1144 Fixed sizing of Local Effects Area dropdown.
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5
Former-commit-id: 88ba04e791 [formerly 8ca431ab8b ] [formerly ee7985bd57 ] [formerly 88ba04e791 [formerly 8ca431ab8b ] [formerly ee7985bd57 ] [formerly 16260530e9 [formerly ee7985bd57 [formerly 3e7360c68b5f6cfdd2a7d79c10f22b2a4bfcc7f5]]]]
Former-commit-id: 16260530e9
Former-commit-id: 064d7a2afc [formerly e0e3e4a044 ] [formerly 22524cf34987f12d7db2178a5437262655f63666 [formerly 309196b6e1 ]]
Former-commit-id: b63148319d11f61113329e47c01d50715af7ae2f [formerly 86455f1e6a ]
Former-commit-id: 8f85204091
|
2012-09-06 17:44:00 -05:00 |
|
Bryan Kowal
|
1bfa55285b
|
Issue #1141 - Merging KML into the Common Baseline
Former-commit-id: 2f7fae43cc [formerly 8d444b35d3 ] [formerly 3180ae0c57 ] [formerly 2f7fae43cc [formerly 8d444b35d3 ] [formerly 3180ae0c57 ] [formerly 7b45633097 [formerly 3180ae0c57 [formerly c3f584fdc5f53ecd62afe41c481aaa96cf532009]]]]
Former-commit-id: 7b45633097
Former-commit-id: c17cb133e0 [formerly 23c607980a ] [formerly 0b9e06862a6cbda27a651857f407897e0b354900 [formerly b63d426e0f ]]
Former-commit-id: 9e2bb30df2820dcdb86d7578eac6e182c2ae3240 [formerly 60c3fb248f ]
Former-commit-id: 675fdff183
|
2012-09-05 18:39:08 -05:00 |
|
Max Schenkelberg
|
e6344fb405
|
Issue #29 Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c
Former-commit-id: e06d1dabef [formerly a14d5d4c86 ] [formerly c183a0e614 ] [formerly e06d1dabef [formerly a14d5d4c86 ] [formerly c183a0e614 ] [formerly 28d6308444 [formerly c183a0e614 [formerly a4dd750d4bbdaae4a548c9a296436cc783d2d71a]]]]
Former-commit-id: 28d6308444
Former-commit-id: e7b2f69ff3 [formerly 45d6b7bcb5 ] [formerly b4ace038bdcc2b915892986d414af1d5d5480636 [formerly 87bcbdb4cc ]]
Former-commit-id: 5eefafca4bd5634f3cfc855808c975e58e51c2fe [formerly 4f86d1c819 ]
Former-commit-id: 9980bf4f49
|
2012-09-05 11:51:38 -05:00 |
|
Ben Steffensmeier
|
ac770a948b
|
Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8
Former-commit-id: 513bd44ba0 [formerly dc6f5805ef ] [formerly 4272f4c885 ] [formerly 513bd44ba0 [formerly dc6f5805ef ] [formerly 4272f4c885 ] [formerly c618ee9057 [formerly 4272f4c885 [formerly 5da7b54e1bff66ed46400bc624b9d881d0b967ce]]]]
Former-commit-id: c618ee9057
Former-commit-id: 49524b9109 [formerly 66e9b24e51 ] [formerly 1e8fa5942894142a7af4316bb2f69d7081706dc3 [formerly e0a4fe2c43 ]]
Former-commit-id: 2609f964204294c255f42e29c0b9fb07af09999d [formerly 64ef6f58f1 ]
Former-commit-id: 44d8021a72
|
2012-09-04 13:41:10 -05:00 |
|
Steve Harris
|
46d05b60a1
|
Merge branch 'ss_builds' (12.10.1-1) into development
Former-commit-id: 319927240c [formerly 0e046d847a ] [formerly bba4eb12d0 ] [formerly 319927240c [formerly 0e046d847a ] [formerly bba4eb12d0 ] [formerly af106f1d29 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]]]
Former-commit-id: af106f1d29
Former-commit-id: 20e088a957 [formerly f224e3e8ad ] [formerly fa15b185c1fb287218beaf2772d775077049f22b [formerly 53e29f59e4 ]]
Former-commit-id: 3d9b8193220e5e34df1a2294f95f1fef387de77d [formerly e9582cb789 ]
Former-commit-id: f8e7459dfb
|
2012-09-04 12:11:03 -05:00 |
|