Commit graph

1089 commits

Author SHA1 Message Date
Max Schenkelberg
d43e0c1c25 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: be99f6c7ca [formerly 3e128b266a] [formerly 5db71ca943 [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]
Former-commit-id: 5db71ca943
Former-commit-id: b74d788909
2012-12-12 11:39:32 -06:00
Nate Jensen
94b9d10c81 Issue #1409 Initial implementation of hydro data access
Change-Id: I309694f9477384446658520794e19ca9493473fb

Former-commit-id: c236b4e1ad [formerly 817717fe0a] [formerly 85658e7e1d [formerly ae7ac8a8bfc51d1c7dc3493c8fc036a87772f323]]
Former-commit-id: 85658e7e1d
Former-commit-id: 3c2865bbd7
2012-12-12 11:20:42 -06:00
Ron Anderson
f4624af03c Issue #1395 Comment out change in p2-build.xml to fix build
Change-Id: I47d426383734b876d5def9ba03677ef7ff745403

Former-commit-id: c5cd2304a9 [formerly 5327d88a6d] [formerly 06fdf91a1c [formerly 4636ad873e7de401e6384dd42857265e962aa8d9]]
Former-commit-id: 06fdf91a1c
Former-commit-id: 17b983ba02
2012-12-12 09:09:28 -06:00
Ron Anderson
14849786eb Merge "Issue #1395 Modifed AwipsCalender and added additional date/time related widgets" into development
Former-commit-id: 4ba089395c [formerly d05dc0c6ca] [formerly 277c9cb0ec [formerly c6c26811ad96f862ae3ffb0e6d9056f0d9edecfb]]
Former-commit-id: 277c9cb0ec
Former-commit-id: 087af45be8
2012-12-11 16:09:24 -06:00
Ron Anderson
01081fe723 Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: cc883294f1 [formerly bc5f445ecf] [formerly 43881be47a [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]]
Former-commit-id: 43881be47a
Former-commit-id: 641d268bd8
2012-12-11 13:31:05 -06:00
Nate Jensen
a3fb320e10 Merge "Issue #1362 create a new resource handler when nsharp is created in a side pane." into development
Former-commit-id: c34ff0c0b8 [formerly decb23f4ae] [formerly 773ff8c027 [formerly 273aed63277891eb091817c5769fe53ef3813759]]
Former-commit-id: 773ff8c027
Former-commit-id: 5b1ca237b2
2012-12-11 12:42:51 -06:00
Steve Harris
15849ae72a Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: d4686333a1 [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]
Former-commit-id: ce72ebb094
Former-commit-id: 113fdcb679
2012-12-11 08:56:54 -06:00
Steve Harris
f02c1ef71d Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
2012-12-11 08:45:53 -06:00
Ben Steffensmeier
d2f5643093 Issue #1362 create a new resource handler when nsharp is created in a side pane.
Former-commit-id: 50ff73809f [formerly 52497f5630] [formerly 0eb454f0d4 [formerly 62cb0df39d0c24edc80d635f3bf90d2abc564b04]]
Former-commit-id: 0eb454f0d4
Former-commit-id: 84fa621b55
2012-12-10 17:58:04 -06:00
Roger Ferrel
80d7309ea7 Issue #1353 Changes for non-blocking DamDisplayControlDlg.
Change-Id: I8a07b7ed7a7e46d243f0319850e2611e0cd05475

Former-commit-id: f9a8d30c4d [formerly 35261a7964] [formerly 40b8e4ec57 [formerly 25051f8e5de207d39cedcf5ff42ec1f8305c5c9a]]
Former-commit-id: 40b8e4ec57
Former-commit-id: fdad99bcc8
2012-12-10 11:30:06 -06:00
Lee Venable
17b9e0077c Merge "Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg." into development
Former-commit-id: 3a4eb415f2 [formerly 59b2cf8872] [formerly 8e7143967b [formerly 050d9cebb8de520c7ed0d27c686ebf84dc6d084c]]
Former-commit-id: 8e7143967b
Former-commit-id: f3b9d1cb38
2012-12-10 11:28:34 -06:00
Roger Ferrel
bc26433783 Issue #1353 Changes for non-blocking AlertAlarmValuesDlg, GetAppsDefaults, SHEFAppsDefaultsDlg and BestEstimateQpeDlg.
Change-Id: Id2826d4816c26454418d54811b0b0c81dc437481

Former-commit-id: f72e89ad2c [formerly 921566317a] [formerly 81966d39fc [formerly 62cdaba1d9e59c77efe6253105582894cd8596a0]]
Former-commit-id: 81966d39fc
Former-commit-id: 053584c4e2
2012-12-07 14:43:53 -06:00
Slav Korolev
a0d07a46f9 Issue #1351. Changes for non-blocking dialog MonitorDisplayThreshDlg. Changes according to comments. Deleted unused file.
Change-Id: I62f1d4ad30ca4ed120c0ca94abf140a1e0b90ce6

Former-commit-id: 829899374d [formerly 48f074eb72] [formerly 1a510a9f61 [formerly c063c2bdb4d4cc7c59917e9882fe78cabb63c06d]]
Former-commit-id: 1a510a9f61
Former-commit-id: 6bf265624d
2012-12-07 15:18:03 -05:00
Nate Jensen
7b004618b5 Merge "Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw" into development
Former-commit-id: 80c743ac8b [formerly 4867cd2a64] [formerly a505d78463 [formerly 6ae7f9a4947420a6985ecbe2834f9c9fc9f5cac4]]
Former-commit-id: a505d78463
Former-commit-id: ef76ea6d61
2012-12-07 13:32:29 -06:00
Lee Venable
78a124efe3 Merge "Issue #1353 old test code classes." into development
Former-commit-id: 4ae765fc4f [formerly 0d74bf9e67] [formerly 4e13d01e67 [formerly 54765a26d6ca098133ff1e0b16c56e94e4053f74]]
Former-commit-id: 4e13d01e67
Former-commit-id: fa143bd2e1
2012-12-07 13:22:46 -06:00
Nate Jensen
94bc1dc9ae Merge "Issue #1396 fix thin client" into development
Former-commit-id: 206e288594 [formerly 01c27ce5aa] [formerly f577fc578d [formerly 4ec3746745f0983226db5e0b9e4969ef0885c44f]]
Former-commit-id: f577fc578d
Former-commit-id: 7257650eea
2012-12-07 13:18:41 -06:00
Lee Venable
dfb7dfc55a Merge "Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs." into development
Former-commit-id: 6a8ae7c255 [formerly ee2572e7c0] [formerly 650420354f [formerly c94fde29a1e43467378bc11100fbe0fdfcf7a51a]]
Former-commit-id: 650420354f
Former-commit-id: e5cf7d4ba5
2012-12-07 13:02:53 -06:00
Lee Venable
b33bdc354e Merge "Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments." into development
Former-commit-id: bf83e5b5c6 [formerly 2c44afd3ab] [formerly 37b91cccb0 [formerly 4bab9df17245e28128644fcdbfb8bac6d4c6dc7e]]
Former-commit-id: 37b91cccb0
Former-commit-id: 78af1aa566
2012-12-07 12:52:44 -06:00
Nate Jensen
7c0941e292 Issue #1396 fix thin client
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100

Former-commit-id: 851f8977f3 [formerly 020b84e373] [formerly 03e6f7ee16 [formerly 1afd50427bff0a11ebbf99eb3b29d2d8c3e02c44]]
Former-commit-id: 03e6f7ee16
Former-commit-id: 496fa1ede9
2012-12-07 11:59:13 -06:00
Max Schenkelberg
d0e091312a Issue #1328 Fixed invalid thread access issue when parm inventory changes and GridCanvas needs to redraw
Change-Id: I8207e9e3082db861c8040858ef11dc67e63747da

Former-commit-id: 72f31d5f0c [formerly d833d917db] [formerly d7c9ac3b84 [formerly ba1d1a6bfe57466a6a0fe5864cd87ffefe61a2f8]]
Former-commit-id: d7c9ac3b84
Former-commit-id: e27d415da5
2012-12-07 11:44:46 -06:00
Roger Ferrel
ddab76526a Issue #1353 old test code classes.
Change-Id: I5b0f7a45ff6e00c669aa1acc6493350f90a66350

Former-commit-id: 754afb9c52 [formerly cfb11d2d38] [formerly 327f35c657 [formerly 51f185625e30425c1466a04d46b3eac39dfac4dc]]
Former-commit-id: 327f35c657
Former-commit-id: 125d271d40
2012-12-07 11:27:31 -06:00
Max Schenkelberg
9a978a9156 Issue #1328 Fixed time matching error for 4-panel products where No Data Available on some of the panes
Amend: Changed time cache object to have single setter for setting fields, changed map to identity map

Change-Id: I598e9033187b794631d1dbfc78bb018084ec95cf

Former-commit-id: dbc9141454 [formerly 8fc766ab05] [formerly 424c6e0b1b [formerly 9a5766f8a6bd61734b2f9e44aaabbef835d1d676]]
Former-commit-id: 424c6e0b1b
Former-commit-id: 4cb9cc5632
2012-12-07 11:24:44 -06:00
Slav Korolev
b5fc4b6800 Issue #1351. Changes for non-blocking FogMonThreshSetupDlg. Changes according to comments.
Change-Id: I605f6819def85f197e37e13803627baec67e6786

Former-commit-id: 349ea52e2b [formerly a284f0f50f] [formerly b650fa6675 [formerly 64fffb1598b943dc9890d2b9ee04a690c006bfe7]]
Former-commit-id: b650fa6675
Former-commit-id: 1c16ed59c1
2012-12-07 12:23:39 -05:00
Roger Ferrel
351e3711fb Issue #1353 Changes for non-blocking FFMPSplash and LoadSaveConfigDlg dialogs.
Change-Id: Ie8589daa43e45a83835d119bdecc1674c7104ed0

Former-commit-id: 991c64f0a9 [formerly 0c83b2a277] [formerly 3cb0385a93 [formerly c243a7bdb065db53dee2a01b251e5fbc5f1ec23e]]
Former-commit-id: 3cb0385a93
Former-commit-id: b6ae15b04e
2012-12-07 10:46:14 -06:00
Lee Venable
a4bbcd2205 Merge "Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg." into development
Former-commit-id: 723e4845e9 [formerly ecb7946aa1] [formerly 4630059ce6 [formerly ca3afef8fe6a7a5840a35af569927a1e8e1a6bfd]]
Former-commit-id: 4630059ce6
Former-commit-id: 0d626354b8
2012-12-07 08:49:23 -06:00
Ron Anderson
c5b3111795 Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06

Former-commit-id: 45914e0a46 [formerly bb163074fa] [formerly b6fcd999f4 [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]
Former-commit-id: b6fcd999f4
Former-commit-id: 70cca3900b
2012-12-06 17:02:56 -06:00
Ron Anderson
d42afa44dc Issue #1395 Modified LineStyle to contain a definition of the style so that GL and SWT can render them the same way
Change-Id: I9e9875c3d56870309d4c5420a541674fb8733a09

Former-commit-id: 330e913cb2 [formerly 5143e82d4a] [formerly 9398573f2f [formerly 6c2704dffcbadab19611464df580f781bb5ebefd]]
Former-commit-id: 9398573f2f
Former-commit-id: 10479a1909
2012-12-06 15:38:04 -06:00
Ron Anderson
af067ab22c Issue #1395 Factored out AbstractMapHandler pattern
Change-Id: I24e9e12f10742292b04dbf31571f0adfe24e35cd

Former-commit-id: 7ec03736a8 [formerly 91f8c043e1] [formerly 87fbaf8ff4 [formerly 522b3bd9cc24c1d75fe5fbdf6222e72ffb8a8468]]
Former-commit-id: 87fbaf8ff4
Former-commit-id: 39509a66bb
2012-12-06 15:18:49 -06:00
Ron Anderson
426acf7c76 Merge "Issue #1369 fix geotiff import in CAVE" into development
Former-commit-id: 617acaf0ee [formerly 08547b0d36] [formerly f58e79f210 [formerly 2b5b3e68faa94c2d67b7fb4be5b21e58e6925350]]
Former-commit-id: f58e79f210
Former-commit-id: b011ff05a9
2012-12-06 14:14:26 -06:00
Ron Anderson
12232c7975 Merge "Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type" into development
Former-commit-id: 408c47019e [formerly f85dcb12c5] [formerly ab1822c6a2 [formerly f281a810241140999419bc27560d6418d3b2bcc8]]
Former-commit-id: ab1822c6a2
Former-commit-id: d3f595a6aa
2012-12-06 14:09:52 -06:00
Roger Ferrel
b736c70e88 Issue #1353 Changes for non-blocking AttributeThresholdDlg, BasinTrendDlg and ConfigSummaryDlg.
Change-Id: Ie5ed937d78478c91eab84998024ee3347f79c95e

Former-commit-id: d99abd8f22 [formerly 7233f6fd64] [formerly c30152a13d [formerly ea9896b2e8653b5d521c3f2d4a497116d135ea64]]
Former-commit-id: c30152a13d
Former-commit-id: 2a4a7a605f
2012-12-06 13:40:48 -06:00
Lee Venable
1d264b4fa8 Merge "Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables." into development
Former-commit-id: 13750a21e2 [formerly a114b7003e] [formerly e9cef99c97 [formerly 2bebbe390d9398df6d3304b25265ed276fa757aa]]
Former-commit-id: e9cef99c97
Former-commit-id: 17124560bd
2012-12-06 13:26:24 -06:00
Matt Nash
01dc19b06d Issue #1369 fix geotiff import in CAVE
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50

Former-commit-id: cb9cd97d1f [formerly fc4d7daab4] [formerly 10d399aafe [formerly ab5775f5187c2b0a2180dfeebc32774c3a1adb16]]
Former-commit-id: 10d399aafe
Former-commit-id: c9372636d9
2012-12-06 12:02:11 -06:00
Slav Korolev
fd46994bb9 Issue #1351. Changes for non-blocking MonitoringAreaConfigDlg according to reviewer's comments. Changes for History Tables.
Change-Id: Ic68f4afd44a3039707cb80ee71a935aa2f00a6a2

Former-commit-id: 153af1673a [formerly 5e4bbc03a4] [formerly af101861e4 [formerly 82dc81aa3cbdfcfcd0b3f5f6566bfce0b6fddd22]]
Former-commit-id: af101861e4
Former-commit-id: a6241ff4d8
2012-12-06 12:42:06 -05:00
Max Schenkelberg
8974e33edc Issue #1328 Fixed bug in GFE time matcher when no grids are available for discrete type
Change-Id: I71f9f9b23573394e9f98895164be4aef659ec02a

Former-commit-id: 5693e567ef [formerly 032b0948a4] [formerly 2e1bb4f7c6 [formerly a4c781a6c57579f04413dc16a0b3937ac6ce72d4]]
Former-commit-id: 2e1bb4f7c6
Former-commit-id: 2e51e024b8
2012-12-06 11:23:22 -06:00
Roger Ferrel
9e0ca8f515 Issue #1353 Changes for non-blocking AttributesDlg.
Change-Id: I10c64bc287d7b5f79836ce14567df9cb05e4aa5d

Former-commit-id: 48143df9b1 [formerly bdaf7fa39e] [formerly 6efe221abf [formerly da1fcd1d3d1716a1742b2e394d5d28b7d641ec3e]]
Former-commit-id: 6efe221abf
Former-commit-id: 7a146ba846
2012-12-06 09:54:13 -06:00
Lee Venable
a533c424c7 Merge "Issue #1353 Delete old test classes that no longer work or are referenced anywhere." into development
Former-commit-id: 45630ede78 [formerly 67243cacf8] [formerly 3fb520b16b [formerly ff448dd0525f9e66f844c74556228b73a3e68196]]
Former-commit-id: 3fb520b16b
Former-commit-id: 7943e69cf8
2012-12-05 16:19:05 -06:00
Roger Ferrel
f8fb1d2748 Issue #1353 Delete old test classes that no longer work or are referenced anywhere.
Change-Id: Idcd6f01985b73f6a29af1e69699798d23ffc2d22

Former-commit-id: a74be95da7 [formerly eef69ff910] [formerly e985aca148 [formerly 881bff62599a078b6266483f79b8f2b2583fa6e0]]
Former-commit-id: e985aca148
Former-commit-id: 104e7e54ee
2012-12-05 16:06:19 -06:00
Roger Ferrel
778100f3d6 Issue #1353 Changes for non-blocking FFTIControlDlg.
Change-Id: Idf182e728a60d55aeb671201396c97beb3752bb3

Former-commit-id: d509833714 [formerly b81d12f775] [formerly 171dd5c3bf [formerly 8bf40b32fc3d9e0fa11133d8fb7ac94e6dcf4c05]]
Former-commit-id: 171dd5c3bf
Former-commit-id: 2f3b693576
2012-12-05 15:45:43 -06:00
Richard Peter
7e1b51854d Merge "Issue #1390 move envelope reprojection to from COntourSupport to MapUtil" into development
Former-commit-id: d976904786 [formerly 67c0b0245c] [formerly 3d342ebd0b [formerly 08986d69d56c407038f905b973321cdaf7839894]]
Former-commit-id: 3d342ebd0b
Former-commit-id: 98b33be553
2012-12-05 13:01:50 -06:00
Nate Jensen
ea92da516b Merge "Issue #1364 PointsDataManager changed to no longer use File.separator." into development
Former-commit-id: 58fc02d3fd [formerly 320e1f5f43] [formerly e49dcf4490 [formerly 508d298d9e40394679b038977957947fe8f688ab]]
Former-commit-id: e49dcf4490
Former-commit-id: 9230c9cc82
2012-12-05 12:50:52 -06:00
Ron Anderson
45edaa3b68 Merge "Issue #1328 Made GFE use descriptor for time matching and time storage and manipulation" into development
Former-commit-id: b93cfaf286 [formerly 55cc75b5f0] [formerly 6c354222ac [formerly 424fb6edb9314a2fc90c27cf31cc13ff1ab4a594]]
Former-commit-id: 6c354222ac
Former-commit-id: e241aa7db2
2012-12-05 12:42:48 -06:00
Roger Ferrel
fb55a378ad Issue #1364 PointsDataManager changed to no longer use File.separator.
Change-Id: I619cb6670e0e73b19b040e7acce918d0c2eebeb3

Former-commit-id: d500d560c5 [formerly dcc2201b07] [formerly b55ceb3f36 [formerly 2dc070320d9e5f9a4154f0007c708016d7f2cd8f]]
Former-commit-id: b55ceb3f36
Former-commit-id: 6fc0163e37
2012-12-05 12:11:18 -06:00
Ben Steffensmeier
0af2ec4f0a Issue #1390 move envelope reprojection to from COntourSupport to MapUtil
Former-commit-id: 8ba69b5683 [formerly 595b732066] [formerly 9b2389dd7e [formerly 3cd041526b5f827bcdc2ef846b2a04ca71e37c99]]
Former-commit-id: 9b2389dd7e
Former-commit-id: 6bd25a7cfc
2012-12-05 10:47:54 -06:00
Richard Peter
5597c522e0 Merge "Issue #1384 allow the derived parameters to function even if the database has multiple identical coverages, add cluster locking to grid coverage creation." into development
Former-commit-id: ea5314b983 [formerly 970f1fc201] [formerly f279d478f8 [formerly 251535242b781031c5324708db7be1127844c6d0]]
Former-commit-id: f279d478f8
Former-commit-id: 35e382251d
2012-12-04 16:15:16 -06:00
Richard Peter
691db16613 Merge "Issue #1387 updated style rules for RFC-FFG products, fixed never ending Requesting Gridded Data when RFC-FFG is loaded" into development
Former-commit-id: 60de2da63d [formerly 9086b40a2f] [formerly cef8be2e64 [formerly bec1c58fdbea0aff7bfaace01d0bb0274f5c0643]]
Former-commit-id: cef8be2e64
Former-commit-id: 30eec037c3
2012-12-04 14:34:49 -06:00
Ben Steffensmeier
d3456e3ee3 Issue #1387 updated style rules for RFC-FFG products, fixed never ending Requesting Gridded Data when RFC-FFG is loaded
Former-commit-id: 45220299f9 [formerly 95dc87b6cf] [formerly e44db81177 [formerly 26abcb77b1b1157ce6e8bc5bda28202430f2d4f7]]
Former-commit-id: e44db81177
Former-commit-id: e1b134aa35
2012-12-04 14:09:28 -06:00
Ben Steffensmeier
e23992352e Issue #1384 allow the derived parameters to function even if the database has multiple identical coverages, add cluster locking to grid coverage creation.
Former-commit-id: f4c534a556 [formerly 038e87f4b0] [formerly d0e8e3b1c3 [formerly e804d35462beea4483d6c0b01f3f61a2576b8098]]
Former-commit-id: d0e8e3b1c3
Former-commit-id: 7f18e0bbee
2012-12-04 12:49:50 -06:00
Ben Steffensmeier
979e0ccc4e Issue #1371 fix offscreen rendering on graphics cards that don't support luminance.
Former-commit-id: a980e67c9c [formerly 16b918000e] [formerly 73dbed5bfc [formerly 4c620ffc4a6df585c67b41868ec1b28dab21a7e4]]
Former-commit-id: 73dbed5bfc
Former-commit-id: 4a6fc8ea28
2012-12-04 12:28:43 -06:00
Richard Peter
6e65a592f4 Merge "Issue #1380 fix kml handling of uninitialized coor bars." into development
Former-commit-id: 5bb646638d [formerly 2248bf0f53] [formerly 50f2d6ab93 [formerly 4187da110efb8e261aaa92c2b537e461df01ecc1]]
Former-commit-id: 50f2d6ab93
Former-commit-id: 75a74fe4bc
2012-12-04 10:37:23 -06:00