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

1003 commits

Author SHA1 Message Date
Matt Nash
dcda4b3fa4 Issue #1324 make times display in 24 hour time 
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2

Former-commit-id: 7fa21f5041 [formerly 1480e0abfc] [formerly 0a2f7c9ed2 [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]]
Former-commit-id: 0a2f7c9ed2
Former-commit-id: d728ffadd0
 2012-11-12 12:53:26 -06:00
Roger Ferrel
8490814573 Issue #1298 Changes for non-blocking GridInfoDialog. 
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a

Former-commit-id: 1f509c5a54 [formerly 30ef939e3c] [formerly 438731ca2e [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]
Former-commit-id: 438731ca2e
Former-commit-id: 195d876753
 2012-11-12 12:00:03 -06:00
Roger Ferrel
ecba7301a1 Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog. 
Changes from reviewer's comments.

Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079

Former-commit-id: b60cbeda7a [formerly d89ce26aeb] [formerly d489a7ef9f [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]
Former-commit-id: d489a7ef9f
Former-commit-id: e01a4ae243
 2012-11-12 07:14:15 -06:00
Lee Venable
ff21b8d604 Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development 
Former-commit-id: 125ac804a7 [formerly 109076cb73] [formerly dac9544eed [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]]
Former-commit-id: dac9544eed
Former-commit-id: a267d9020b
 2012-11-08 17:06:54 -06:00
Nate Jensen
38511f0e95 Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development 
Former-commit-id: 5e718ca85b [formerly a92bfa9393] [formerly cdd6a986e8 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]]
Former-commit-id: cdd6a986e8
Former-commit-id: 5e3c076506
 2012-11-08 14:50:17 -06:00
Dustin Johnson
eac5bc8197 Issue #1302 Restore jdom.jar, delete net.jcip/.project 
Amend:
  Also change the manifest and .classpath for ohd common

Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b

Former-commit-id: db4d728eb7 [formerly 595c421e47] [formerly 2b6e98954e [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]
Former-commit-id: 2b6e98954e
Former-commit-id: 0806be04dd
 2012-11-08 14:47:17 -06:00
Ben Steffensmeier
7c93db759c Issue #1108 initial implementation of mappings 
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 693090cb36
Former-commit-id: 884c82c4fe
 2012-11-08 14:45:36 -06:00
Roger Ferrel
553344fb3b Issue #1298 Changes for non-blocking IssuanceSiteIdDlg. 
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba

Former-commit-id: 709798659d [formerly e26b14a84d] [formerly 89617dda68 [formerly a2a52b7754d831406e591763930f419def7cb1eb]]
Former-commit-id: 89617dda68
Former-commit-id: 05825bd6f3
 2012-11-08 11:19:51 -06:00
Lee Venable
1e61d4bd08 Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development 
Former-commit-id: 6c0bb76679 [formerly be460c956e] [formerly e791e73a30 [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]
Former-commit-id: e791e73a30
Former-commit-id: 7b5f085643
 2012-11-08 11:11:15 -06:00
Nate Jensen
bdbad943ef Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development 
Former-commit-id: e3487942ac [formerly 96cb1ecc7f] [formerly 01072652dc [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]
Former-commit-id: 01072652dc
Former-commit-id: 375c864d28
 2012-11-08 11:08:48 -06:00
Lee Venable
9523ad6085 Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development 
Former-commit-id: c4526c5ba0 [formerly ff5083715b] [formerly c44f90f675 [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]
Former-commit-id: c44f90f675
Former-commit-id: 4a22ded443
 2012-11-08 10:57:45 -06:00
Roger Ferrel
e7aa940f52 Issue #1298 Changes for non-blocking SaveDeleteComboDlg. 
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f

Former-commit-id: 359ee69fa6 [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]
Former-commit-id: eae8a68fd5
Former-commit-id: 24a2e79b28
 2012-11-08 10:54:41 -06:00
Nate Jensen
fca1922f7b Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development 
Former-commit-id: ca5db2ec43 [formerly 9038ff4e10] [formerly 48dae3a5e9 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]
Former-commit-id: 48dae3a5e9
Former-commit-id: 7da4882cfb
 2012-11-08 10:34:56 -06:00
Max Schenkelberg
c219fcb112 Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time. 
Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b

Former-commit-id: 5f0b4286ba [formerly 9aa4221fdf] [formerly c80dbffad8 [formerly 598e0268c95155536fb94798cc134d18b2566dbc]]
Former-commit-id: c80dbffad8
Former-commit-id: 0a410412db
 2012-11-08 10:08:38 -06:00
Dustin Johnson
2d1e886cf3 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
 2012-11-08 09:57:16 -06:00
Roger Ferrel
9a1283fb1e Issue #1298 Changes for non-blocking FuzzValueDialog. 
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef

Former-commit-id: 3ad0d7d516 [formerly 023252fb84] [formerly c3f451f799 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]
Former-commit-id: c3f451f799
Former-commit-id: de534f5b43
 2012-11-08 08:24:38 -06:00
Roger Ferrel
c1d0b744b2 Issue #1298 Chnages for non-blocking FindReplaceDlg. 
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7

Former-commit-id: 94a4440625 [formerly 76f60240c5] [formerly 199475f671 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]]
Former-commit-id: 199475f671
Former-commit-id: e072532a77
 2012-11-08 07:57:56 -06:00
Nate Jensen
2fe69a5871 Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development 
Former-commit-id: 20a63254e2 [formerly b32a9e839e] [formerly 6b205399d4 [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: 6b205399d4
Former-commit-id: e3208d48a0
 2012-11-07 18:18:06 -06:00
Lee Venable
15842d7d22 Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development 
Former-commit-id: c8955b5425 [formerly 36c44db46b] [formerly 8956718961 [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]
Former-commit-id: 8956718961
Former-commit-id: eacc1ca32c
 2012-11-07 17:38:21 -06:00
Roger Ferrel
42f453ffca Issue #1298 Changes for non-blocking ClearZoneGroupsDialog. 
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0

Former-commit-id: ee038e811c [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]
Former-commit-id: 65d10be5d6
Former-commit-id: 35f3a3953c
 2012-11-07 15:07:47 -06:00
Roger Ferrel
d6e00b6c35 Issue #1298 Changes for non-blocking CallToActionsDlg. 
Change-Id: I4a141c0a3d00cab36b792f4471aaf7482c2fa8dc

Former-commit-id: 4b0c701d69 [formerly 190922a233] [formerly 81de6cd45b [formerly 7e987f7743a068b14e3eb7149f933cdf56e59f61]]
Former-commit-id: 81de6cd45b
Former-commit-id: d6560d7730
 2012-11-07 14:35:38 -06:00
Steve Harris
4f243de928 12.12.1-1 baseline 
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
 2012-11-07 12:41:20 -06:00
Lee Venable
412c29f116 Merge "Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking." into development 
Former-commit-id: 074543d75e [formerly f368b93484] [formerly 297d2bbc9c [formerly badb1ba2ed966e920a0dce9d1612dc07e4a21049]]
Former-commit-id: 297d2bbc9c
Former-commit-id: 24dd8a1bc7
 2012-11-07 12:31:39 -06:00
Roger Ferrel
35b0dc2cef Issue #1298 Changes to make EmptyEditAreaWarningDialog and TimeRangeWarningDialog modal and blocking. 
Change-Id: I6c5679269985eeb32d48afa44862632e00939a91

Former-commit-id: 8bf89ad495 [formerly 82abbbf0b7] [formerly 974431a13a [formerly 8b12ea9f59036ccd47c55f90a86f7d6b589baa0e]]
Former-commit-id: 974431a13a
Former-commit-id: c6749e3740
 2012-11-07 11:27:36 -06:00
Max Schenkelberg
5a5bd522a1 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration. 
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
 2012-11-07 10:44:42 -06:00
Matt Nash
e87cb88d60 Issue #1273 product browser can now change order for grid 
Change-Id: I2e41596925ebd16c733d12b742ff60c0745963a2

Former-commit-id: 76cdfc09bb [formerly 9c9db6643a] [formerly 284aecc6f9 [formerly 9c7477357508794a00267991b825d169df5ae71a]]
Former-commit-id: 284aecc6f9
Former-commit-id: 46f695b72d
 2012-11-06 14:06:49 -06:00
Roger Ferrel
5c241a7e5d Issue #1304 Clear text field when point removed. 
Change-Id: Ia2f56010e7d620023cbf01656c7be30b0dd742cc

Former-commit-id: a6b093c2ce [formerly 921134848b] [formerly 1f71a3bed7 [formerly c927e2eb8a516cf555c0c83a86c51ad209f2a0ab]]
Former-commit-id: 1f71a3bed7
Former-commit-id: a996839d2c
 2012-11-05 12:56:07 -06:00
Roger Ferrel
9fada57123 Issue #1304 Added Point change listners to ChooseByIdDialog and RangeRingDialog. 
Change-Id: Id2933ae7ccfb6ed260da619a822c2b5b706f64d3

Former-commit-id: 120764c5ef [formerly 986766487f] [formerly 3045291a29 [formerly d296028a9a0add9a81836030ff7b65be8883956b]]
Former-commit-id: 3045291a29
Former-commit-id: 2b18983017
 2012-11-05 11:22:28 -06:00
Dustin Johnson
e7a0f96a9a Issue #1302 Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
 2012-11-01 13:36:06 -05:00
Ben Steffensmeier
ec68d0445e Issue #189 a few fixes to grid resources for FFG Mosaic 
Former-commit-id: dc0e75eb29 [formerly 64d4a1add7] [formerly 4b121fd7b3 [formerly f8420e7052145c856b12310776e6acd7362dc9cb]]
Former-commit-id: 4b121fd7b3
Former-commit-id: bde106e70d
 2012-10-31 11:39:32 -05:00
Roger Ferrel
b289472e49 Issue #1298 Changes for non-blocking MaskDialog, WeatherDialog and DiscreteDialog. 
Change-Id: If2ddd15d3abb900cd309f790445bee08ff4e69cc

Former-commit-id: 2b80c2c2b5 [formerly d92be142ad] [formerly 3c64544822 [formerly 17f789e76f77467935002d3b466b764ddb0b81f4]]
Former-commit-id: 3c64544822
Former-commit-id: 1e0241e509
 2012-10-30 17:09:52 -05:00
Lee Venable
7b0e8774db Merge "Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog." into development 
Former-commit-id: 51c60c1876 [formerly 868fe53216] [formerly 2c86fdb2d0 [formerly 08784a33471cc96472370081f31d7d7edb2a61f7]]
Former-commit-id: 2c86fdb2d0
Former-commit-id: 881a8e726b
 2012-10-30 16:46:30 -05:00
Lee Venable
f5008c2296 Merge "Issue #1298 Changes for non-blocking BrightnessDialog." into development 
Former-commit-id: 08e6cd0a31 [formerly 276ce2ad08] [formerly e47d1beb09 [formerly 8d14e957dc2152a31c813a9278646904e2a3c777]]
Former-commit-id: e47d1beb09
Former-commit-id: cebd35bb47
 2012-10-30 16:45:35 -05:00
Lee Venable
364fb3f463 Merge "Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking." into development 
Former-commit-id: eed01fd643 [formerly 33525e4dff] [formerly 0bc4ec2135 [formerly 3bb9ad3e1fb050dba420fc634b742a73b4443ba2]]
Former-commit-id: 0bc4ec2135
Former-commit-id: 2d3eeeaacf
 2012-10-30 16:44:56 -05:00
Roger Ferrel
bc7e45e5e3 Issue #1298 Changes for non-blocking ContourDialog and removal of ButtonEntryDialog. 
Change-Id: I6151274f455066c03db49618d6b5801248d48527

Former-commit-id: 84a338fd4c [formerly 0c544da917] [formerly 7c8f48fcb5 [formerly c67543535ff38b777f14df1f41d96dbdacddeb09]]
Former-commit-id: 7c8f48fcb5
Former-commit-id: c0b480bc7f
 2012-10-30 15:19:08 -05:00
Roger Ferrel
769a831689 Issue #1298 Changes for non-blocking BrightnessDialog. 
Change-Id: I84e0778c62c7cdffe33d89c5b2a3a4f205572483

Former-commit-id: 9dcaf583f6 [formerly bc1e462d07] [formerly 2fb06a145f [formerly 535d952595adfcd749ee132e45736120aa25cd3d]]
Former-commit-id: 2fb06a145f
Former-commit-id: 191e4e83db
 2012-10-30 14:00:20 -05:00
Roger Ferrel
2cbd0000ad Issue #1298 Comments on GridMangerView on why SaveParameterDialog and KillJobsOnExit must stay blocking. 
Change-Id: I034b1f02eb3b1ac623c8d2d4b9a953e53534dba0

Former-commit-id: 3b96d312cd [formerly 8952e1cef8] [formerly e37a097596 [formerly 6dc43f8d58b82a4b59a3945cc41ad8dcdda47a11]]
Former-commit-id: e37a097596
Former-commit-id: b93dcebdc0
 2012-10-30 12:35:48 -05:00
Ben Steffensmeier
1d94435220 merge branch Unifeid_Grid into developement 
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: b6a1563bb2
Former-commit-id: 92fd247ccc
 2012-10-30 12:24:54 -05:00
Roger Ferrel
baef52459d Issue #1298 Changes for GFEConfigDialog. Must be used as a blocking dialog. 
Change-Id: I5a4ad66d3aff1ab4b77b78ec8db233875aa61620

Former-commit-id: 6291083e5b [formerly 87d3ff985e] [formerly 5355b7f620 [formerly 13f856685e36155909e7c4f4f9ac36d3a5633e4a]]
Former-commit-id: 5355b7f620
Former-commit-id: 089e8af498
 2012-10-30 10:34:40 -05:00
Lee Venable
1a475c55de Merge "Issue #1298 Changes for non-blocking WeatherElementBrowserDialog." into development 
Former-commit-id: 3c6facf14b [formerly a7eb12fd9e] [formerly 676856f62f [formerly d6040334d8c3ea717966b54dc6bcc333d67d5b1b]]
Former-commit-id: 676856f62f
Former-commit-id: b491922ddc
 2012-10-30 10:26:53 -05:00
Roger Ferrel
61349397e4 Issue #1298 Changes for non-blocking WeatherElementBrowserDialog. 
Change-Id: I3359b2b9f9bbf1e58735891163fa8fd798e4ac1e

Former-commit-id: 2f4ead5037 [formerly f65213c542] [formerly 4a13cfb8a6 [formerly f37d9edd9803c6a2bbf039662b3f2750b1cec8db]]
Former-commit-id: 4a13cfb8a6
Former-commit-id: 551cffe315
 2012-10-30 09:00:10 -05:00
Roger Ferrel
8fba446977 Issue #1298 Changes for non-blocking TimeShiftDialog. 
Change-Id: I60f60daee3b25fec2dabd09dd44c85bd3e57160c

Former-commit-id: a6f06c265b [formerly 1d67e245aa] [formerly 7af20b6130 [formerly 1deeb17d498a883af24fe983b7967918b3c3deb9]]
Former-commit-id: 7af20b6130
Former-commit-id: 406de0548d
 2012-10-30 08:27:25 -05:00
Roger Ferrel
534b308771 Issue #1287 Changes for blocking ServiceBackupDlg in stand alone mode and removal no longer uses class. 
Change-Id: Ice2b62bd22044f77536e00650962bfb9ea7d4082

Former-commit-id: af547b7c6f [formerly 55461bc61d] [formerly 4a2ae2f6db [formerly ac8b26304f847a41c7b9befcc0d16b76e9a8e16d]]
Former-commit-id: 4a2ae2f6db
Former-commit-id: 67d404ad87
 2012-10-29 13:31:43 -05:00
Steve Harris
e211bfc043 Merge branch 'ss_builds' into development 
Former-commit-id: 340ce53e22 [formerly fb46bb053d] [formerly afb534db67 [formerly 791639aecd4c192b4bb8d8bb692f2c696cde1daa]]
Former-commit-id: afb534db67
Former-commit-id: 048c0c88cd
 2012-10-29 12:17:12 -05:00
Steve Harris
d8b6157aab 12.11.1-12 baseline 
Former-commit-id: 565756567f [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 314c03e7b6
 2012-10-29 12:15:56 -05:00
Lee Venable
55186d5a74 Merge "Issue #1287 Changes for non-blocking TimeScalePeriodsDialog." into development 
Former-commit-id: 01bd16bbd7 [formerly eb660ac54d] [formerly 4bc57aec7e [formerly edfda206905211559bfd5b384ccae129d11bb5cb]]
Former-commit-id: 4bc57aec7e
Former-commit-id: 79a5d07605
 2012-10-29 08:40:34 -05:00
Roger Ferrel
d414206760 Issue #1287 Changes for non-blocking TimeScalePeriodsDialog. 
Change-Id: I5bed1a9f3ee792099749b26071ed2816c84f6049

Former-commit-id: 74c8f86b27 [formerly ea2fdbc1b8] [formerly 99179463f5 [formerly aa32e71beadc5b9302abddedeb53003a66a57261]]
Former-commit-id: 99179463f5
Former-commit-id: 22ebd6b55a
 2012-10-29 08:09:57 -05:00
Roger Ferrel
8adebd22d3 Issue #1287 Changes for non-blocking SiteActivationDlg. 
Change-Id: Id059058fda486b57df5d461f3c9eb13981f7f744

Former-commit-id: b345d95b4d [formerly 8c5b00fa42] [formerly 2ab4a8508a [formerly ae1185cb5825915820314fdc48c897676ead8538]]
Former-commit-id: 2ab4a8508a
Former-commit-id: 8fca4cf256
 2012-10-29 07:21:00 -05:00
Lee Venable
c79354b0a6 Merge "Issue #1287 Chagnes for non-blocking TemporalEditorRangeStatisticsDialog." into development 
Former-commit-id: d7c043dffa [formerly 6c3b12a9d3] [formerly ddbed06f64 [formerly e16cb0c6c05d7e2fc4ab6eac04217f60df5bcc4b]]
Former-commit-id: ddbed06f64
Former-commit-id: 7621f14d95
 2012-10-26 15:28:37 -05:00
Lee Venable
2280eef896 Merge "Issue #1287 Changes for non-blocking SetInterpolationAlgorithmDialog." into development 
Former-commit-id: 656b6bf04e [formerly 84e66d2fab] [formerly 0967a6348b [formerly 53a9d4129eadd0156855a5c9248ce2848cb08d95]]
Former-commit-id: 0967a6348b
Former-commit-id: 1407f47d1c
 2012-10-26 15:28:07 -05:00