Ron Anderson
bf7960b5f9
Merge "Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item." into development
...
Former-commit-id: e49ea6c147
[formerly 6f79ba14e6
] [formerly c17e0a19c9
[formerly 6e0bfe56d437622b9c5f6e3d4d8d9c0192fc5a46]]
Former-commit-id: c17e0a19c9
Former-commit-id: cb4721ae15
2012-12-13 15:47:04 -06:00
Ron Anderson
8b81f0bfb4
Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
...
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1
Former-commit-id: 3e4aeeab8b
[formerly 753fa0487b
] [formerly 639b5abbd9
[formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]]
Former-commit-id: 639b5abbd9
Former-commit-id: 995f28220a
2012-12-13 15:25:24 -06:00
Nate Jensen
31d8e9a9ae
Merge "Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension" into development
...
Former-commit-id: acccca74eb
[formerly 67d30566c0
] [formerly 823bedcebd
[formerly e7b347563598a3f4809cc74096de1f2dc0ef0788]]
Former-commit-id: 823bedcebd
Former-commit-id: 0388c1b179
2012-12-13 14:25:56 -06:00
Lee Venable
2c29835b63
Merge "Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit." into development
...
Former-commit-id: fabb15ab10
[formerly d098b2e271
] [formerly 3ca1080fa0
[formerly c7e9e83612df941e1c6a99cac5d07a724525bbb3]]
Former-commit-id: 3ca1080fa0
Former-commit-id: 1be8e81228
2012-12-13 14:24:55 -06:00
Nate Jensen
ceceed5b27
Merge "Issue #1369 add pattern to p2-build.xml file to match the new cots product" into development
...
Former-commit-id: c2bc33e51a
[formerly f0340fba98
] [formerly 59f315f14b
[formerly 4663e9a09db1fbf0e3f72dd9893e5daa73698f90]]
Former-commit-id: 59f315f14b
Former-commit-id: e5ad2acde4
2012-12-13 14:13:57 -06:00
Roger Ferrel
d3482bd513
Issue #1353 Fix bug in TextWorkstationDlg "Show All" option and TextEditorDialog cancel edit.
...
Change-Id: Iaff7b8b64e2b1a94680c29087d174a27658c5873
Former-commit-id: 9d770cf725
[formerly 65699f7a26
] [formerly 77c60c8925
[formerly 8eee3bf91d4e40b55b36f699ecf7ca37bc6591aa]]
Former-commit-id: 77c60c8925
Former-commit-id: 258dd80db8
2012-12-13 13:50:47 -06:00
Matt Nash
3f76c7ab62
Issue #1400 fix for local and regional warnings, made the WatchesResource better handle extension
...
Change-Id: I6cc0d8eb6079efc224136b67962903b75330c8e1
Former-commit-id: 9d35cdf724
[formerly c992d831af
] [formerly 3ff52fb9ff
[formerly 8e1660c65bbb6ad76bdc44c3327819170c3244f5]]
Former-commit-id: 3ff52fb9ff
Former-commit-id: 7d5f78c785
2012-12-13 13:00:09 -06:00
Matt Nash
5de49c6734
Issue #1369 add pattern to p2-build.xml file to match the new cots product
...
Change-Id: I5a30c7fd6067b1c59794983c67b8186775af3849
Former-commit-id: a661c27de7
[formerly cf0090b7d4
] [formerly 87b4d4b4e6
[formerly a862d259af867bd15d381e05e421d8d653ae4f21]]
Former-commit-id: 87b4d4b4e6
Former-commit-id: 83b9a4dfb7
2012-12-13 12:42:40 -06:00
Bryan Kowal
bad53d1b7f
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
Former-commit-id: c3da463f39
[formerly a210f08acc
] [formerly 0970259114
[formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]
Former-commit-id: 0970259114
Former-commit-id: 9490652103
2012-12-13 12:40:31 -06:00
Richard Peter
541c2cf5e3
Merge "Issue #1415 fix or level node time matching Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a" into development
...
Former-commit-id: d773303870
[formerly 4b2e80da58
] [formerly fffeaecbe5
[formerly 1f04e62af4557d74f9a5378d88571a01060b9891]]
Former-commit-id: fffeaecbe5
Former-commit-id: d0cdd8f533
2012-12-13 11:57:37 -06:00
Ben Steffensmeier
1a3f91949c
Issue #1415 fix or level node time matching
...
Change-Id: If4d05a6d181856dacc14a103fb51f2755dcf706a
Former-commit-id: 80a3471237
[formerly 3ac43300fc
] [formerly 9da83d3f4f
[formerly 7ad0749d76328eafcd2f02137c099f7a302e0387]]
Former-commit-id: 9da83d3f4f
Former-commit-id: 199577ed39
2012-12-13 11:35:15 -06:00
Nate Jensen
a9395e64ab
Merge "Issue #1421 : Make hdf5 and database purge the same, update H5pyDataStore" into development
...
Former-commit-id: c2c508d495
[formerly 8953fcf4af
] [formerly 8a6844e5a3
[formerly 93c0e07b71d33560678eb3781465e20e9222642d]]
Former-commit-id: 8a6844e5a3
Former-commit-id: 8208937771
2012-12-13 11:05:12 -06:00
Richard Peter
e2007e61e1
Issue #1421 : Make hdf5 and database purge the same, update H5pyDataStore
...
Change-Id: I9cbe9c5cb185b4eb999b0c0a2d6ff6b6d754d0e7
Former-commit-id: 3d4fb31161
[formerly 513dd75a23
] [formerly 08919e73c3
[formerly fb25e736d298225d217a1775891a65de7e0bd50c]]
Former-commit-id: 08919e73c3
Former-commit-id: f7859723e5
2012-12-13 11:02:07 -06:00
Matt Nash
210da024a4
Issue #1369 add geosolutions project to cots feature
...
Change-Id: I62dd15c2f0d2ee017fcb3ad9483399b688c508f3
Former-commit-id: 6949c1f105
[formerly 1d56d879fb
] [formerly ab07a92d48
[formerly 01033bfd4b1b298095697267be60d978aa5c14a5]]
Former-commit-id: ab07a92d48
Former-commit-id: d24fab93dd
2012-12-13 09:40:49 -06:00
Ben Steffensmeier
8c66a66834
Issue #1401 add the word Grid in front of load properties because that always makes things better.
...
Former-commit-id: 8b3667d646
[formerly 1848f614fd
] [formerly d43336bcbd
[formerly 345673524a287d87efbdfcb60ef838dd78c33ae3]]
Former-commit-id: d43336bcbd
Former-commit-id: ff5a5cac4c
2012-12-12 14:33:48 -06:00
Nate Jensen
231ddfb978
Merge "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" into development
...
Former-commit-id: 291bb86680
[formerly d0fe7c860f
] [formerly 6debcb5ff4
[formerly 9a388df8f163c1bbde711c12dcda1a7c8f70bf06]]
Former-commit-id: 6debcb5ff4
Former-commit-id: 196fdc6110
2012-12-12 12:27:30 -06:00
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
Ben Steffensmeier
5d87636fb2
Issue #1356 add javadoc to subgrid changes.
...
Former-commit-id: c44dad8a5c
[formerly 6da5ac2873
] [formerly 7e6d6fa794
[formerly 618c8a0accbfde0e95d47b76659f3804b32a7652]]
Former-commit-id: 7e6d6fa794
Former-commit-id: 47cb87096a
2012-12-11 17:40:28 -06:00
Richard Peter
f7de6135ca
Merge "Issue #1356 create subgrid for grib files with extra columns" into development
...
Former-commit-id: 559876930b
[formerly 9f9c32fc4e
] [formerly 4082968b07
[formerly d489dcb15e98ae3b07665df4fc2edd2bb852c7db]]
Former-commit-id: 4082968b07
Former-commit-id: ada54d8e92
2012-12-11 17:05:27 -06:00
Richard Peter
6613cbf5ee
Merge "Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea" into development
...
Former-commit-id: 6bc665ca3a
[formerly 63465edb95
] [formerly 2a5171c2f3
[formerly 5117b93ee59b6c291d16e084d7a0be0e492b120f]]
Former-commit-id: 2a5171c2f3
Former-commit-id: 1100c4fa8b
2012-12-11 16:38:53 -06:00
Ben Steffensmeier
a693a33f97
Issue #1390 fix envelope reprojection and add serializeable ojects for referenced envelopes
...
Change-Id: I2e79709d1323ed17879b4f59229361fe935aa0ea
Former-commit-id: b32d039c92
[formerly b77f1592a7
] [formerly 11d3ee3014
[formerly a6c7730ba1c0b07fdf21bef19717859fc7238724]]
Former-commit-id: 11d3ee3014
Former-commit-id: 9277840fad
2012-12-11 16:12:53 -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
Ben Steffensmeier
ddcb3e675d
Issue #1356 create subgrid for grib files with extra columns
...
Former-commit-id: dd560f4d15
[formerly c3e1005dc8
] [formerly a7a13d27cd
[formerly c9c82e37fa21a01a7357c2e065aea435b325587f]]
Former-commit-id: a7a13d27cd
Former-commit-id: 64922c17c5
2012-12-11 16:00:03 -06:00
Roger Ferrel
662d51cda1
Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
...
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4
Former-commit-id: 6929a73900
[formerly b677a5ba3d
] [formerly aefa650cda
[formerly b406c990607a06678a58e36118edcddaab073b26]]
Former-commit-id: aefa650cda
Former-commit-id: f64a99d554
2012-12-11 15:43:54 -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
Dustin Johnson
4de56a0141
Issue #1407 EventBus changes to support sending notifications for subscription verification
...
Change-Id: I8f979e44520e32fa908aa700bb0c93596a2dd820
Former-commit-id: 79fa61bb8a
[formerly 8b942c31dd
] [formerly 3d900240b7
[formerly 12b51905d9b710ebc6fa54346d82cad9178b0bba]]
Former-commit-id: 3d900240b7
Former-commit-id: e72d5dc09d
2012-12-11 09:37:20 -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
Brad Gonzales
15b3a61287
Issue #1398 moved freezingLevel.cron from cron.properties to com.raytheon.uf.edex.ohd.properties.
...
Change-Id: I7f69e140c32c7650c193344e661062df3d09a54d
Former-commit-id: 4e44770674
[formerly bcff2c134c
] [formerly 6ab74bb6ab
[formerly 5aa303242b0ca1abf08685b6197ddd17d465250c]]
Former-commit-id: 6ab74bb6ab
Former-commit-id: 065ddf4d4a
2012-12-10 14:08:54 -06:00
Richard Peter
f78c720d68
Merge "Issue #1367 : Fix static topo route uri" into development
...
Former-commit-id: 3781119c4f
[formerly 9a5fc20edb
] [formerly a33301394c
[formerly 0bfbe098d5ae0bc93f536fd09e6fa5e63c6dd10d]]
Former-commit-id: a33301394c
Former-commit-id: 932f49fd2c
2012-12-10 12:59:36 -06:00
Lee Venable
8b25017106
Merge "Issue #1353 Changes for non-blocking DamDisplayControlDlg." into development
...
Former-commit-id: 3afa901791
[formerly ef814e2d0b
] [formerly 1175e34b0d
[formerly ce03df033eac42f2d035a7483349ba9db315a2e4]]
Former-commit-id: 1175e34b0d
Former-commit-id: f122f274ac
2012-12-10 12:55:16 -06:00
Richard Peter
b3cccde136
Issue #1367 : Fix static topo route uri
...
Change-Id: Iba75a46bcd52356fd190573520639217aaa77d02
Former-commit-id: 328d065216
[formerly 44f90a6f65
] [formerly 7d292d1731
[formerly b4b395876a00f9b1a80314a90c0d88ea913e52bc]]
Former-commit-id: 7d292d1731
Former-commit-id: 8ba7c0ae7c
2012-12-10 12:40:18 -06:00
Richard Peter
912b2ec928
Issue #1394 : Reduce GFE Grid Database calls
...
Change-Id: I7462cca18b1b46169b25611dddbad844895be0cd
Former-commit-id: ac41861f0b
[formerly 3c3c695f24
] [formerly 0670ac79fa
[formerly bc127f06236cb1e09dc0c87fee578e4a0cb60063]]
Former-commit-id: 0670ac79fa
Former-commit-id: 0cdb86b6ac
2012-12-10 11:59:54 -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
Richard Peter
1489ae1fdb
Merge "Issue #1389 Create an adapter class and use Collections.binarySearch()" into development
...
Former-commit-id: 43584fa1bb
[formerly 7588d18d02
] [formerly 79d6219dc4
[formerly f21715c04be0c4e82975aab413110d00f64b1ebc]]
Former-commit-id: 79d6219dc4
Former-commit-id: 51d849368c
2012-12-07 13:18:40 -06:00
Richard Peter
40287c3be1
Merge "Issue #1367 broke grib ingest into two routes, better exception message from remote thrift service handler" into development
...
Former-commit-id: 1806a444bb
[formerly 7b054e58ed
] [formerly 18e4f52967
[formerly 0e79b66173d37d81e13f263c70685189ba924fc3]]
Former-commit-id: 18e4f52967
Former-commit-id: c6fe3df93d
2012-12-07 13:14:46 -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