Roger Ferrel
2b4b10d643
Issue #1735 ForecastPointDataRetrieve now uses DbQueryRequest to obtain forecast times in asscending order and option to limit times returned.
...
Change reviewer comments.
Change-Id: Ida69b63198ffa5c229eedd3abb42c4f5f9e1d00d
Former-commit-id: f8d1a13c38
[formerly 54cbf656e9
] [formerly d2aae617b2
[formerly b836dcb6d55dfbdf8e825fb194903d45a83382c8]]
Former-commit-id: d2aae617b2
Former-commit-id: 7b829a2fec
2013-04-03 12:48:18 -05:00
Nate Jensen
1ad5bb1a52
Merge "Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development." into development
...
Former-commit-id: ab28523a09
[formerly f57358cff8
] [formerly 8f9ec8dd2c
[formerly 4f965dfb6a15e853eb64c9ebf4a646ba4ad156a8]]
Former-commit-id: 8f9ec8dd2c
Former-commit-id: 374eed35b3
2013-04-02 14:29:15 -05:00
Dustin Johnson
644ed2396d
Issue #1841 Split up Subscription hierarchy in support of shared subscriptions.
...
Amend:
Use TimeUtil.newGmtCalendar() and remove whitespace only change
Add TODO for point data types.
Change-Id: If232ef50a63066e85b122d4247fa767fc31313d3
Former-commit-id: 48a2002e68
[formerly c981b7250f
] [formerly 6129d86be4
[formerly b91593c0a50114e4766ecf83d92e7f25b58bbbf8]]
Former-commit-id: 6129d86be4
Former-commit-id: dd8f4d8454
2013-04-01 15:35:51 -05:00
Max Schenkelberg
ba262e2bc5
Issue #1847 Merged NPP NUCAPS changes from omaha_13.2.1-NPP into development.
...
Change-Id: I37c3135794c991e2405d556823a22768dd491f00
Former-commit-id: 9d032f3e84
[formerly b32fbad9c8
] [formerly 547190329b
[formerly 7b37bda291882ff345d466f4338b6707ed84d4d5]]
Former-commit-id: 547190329b
Former-commit-id: 635388a7ad
2013-04-01 12:41:50 -05:00
Steve Harris
7b27767d7e
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java
Former-commit-id: 736bb45741
[formerly 140765a43e
] [formerly 437a04011a
[formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]
Former-commit-id: 437a04011a
Former-commit-id: 0b48e96314
2013-04-01 12:19:04 -05:00
Steve Harris
f85a1ab9ab
Merge branch 'master_13.3.1' (13.3.1-17) into omaha_13.3.1
...
Conflicts:
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Former-commit-id: 3b722f1076
[formerly 74a47b9bd9
] [formerly 14c9de2259
[formerly 98ddc22749f0e5cdb0f4f8f0084ee742486461d5]]
Former-commit-id: 14c9de2259
Former-commit-id: a6dd28cc82
2013-04-01 12:15:04 -05:00
Steve Harris
ef413da5f7
13.3.1-17 baseline
...
Former-commit-id: f28b85d42f
[formerly 7bf9966dcb
] [formerly a3fe998f8f
[formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: a3fe998f8f
Former-commit-id: 4afa41d4e7
2013-04-01 12:04:56 -05:00
Steve Harris
2bf790aae3
13.3.1-15 baseline
...
Former-commit-id: 4cf3ad6abb
[formerly eb1dab3864
] [formerly 3d8ed484be
[formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: 3d8ed484be
Former-commit-id: d3cec5d3cb
2013-04-01 11:33:20 -05:00
Max Schenkelberg
8de3a70962
Issue #1638 Added Auto updating localization file object and added more methods to RecordFactory to make more versatile
...
Amend: Fixed setting of nested field properties
Amend: Moved populating and creating map into PluginDataObject, fixed listener leak in AbstractVizResource
Amend: Added comments
Change-Id: I699ab6a669a11656044c1d55f0bca9d258528835
Former-commit-id: a508e9c8cb
[formerly 321a29ffa4
] [formerly 51d976e5e2
[formerly 9eaa57677f77ff919f1a55ee7ad4b44a0613b97a]]
Former-commit-id: 51d976e5e2
Former-commit-id: 1c35a54a9f
2013-04-01 10:19:36 -05:00
Ron Anderson
d5e3976dc4
Issue #1774 Fix invalid unit strings in parameterInfo files.
...
Change-Id: I681f323b91f213dad5d2ad725bfb77f304e769de
Former-commit-id: cfb324f380
[formerly aeb451a37c
] [formerly 679bb01764
[formerly 961526d5a895922b07b8358d5b284f7fc9b02566]]
Former-commit-id: 679bb01764
Former-commit-id: 96e8f63679
2013-03-29 10:07:37 -05:00
Greg Armendariz
dcd36e64a6
Fix merge issue
...
Former-commit-id: 611661ccc9
[formerly cd5da3a6c5
] [formerly 5da06cadd7
[formerly c9c8fc9c7ece8ab909b13b63964369b36fb20bc0]]
Former-commit-id: 5da06cadd7
Former-commit-id: f0e1b80cd2
2013-03-29 09:52:46 -05:00
Greg Armendariz
05af592718
Change package location of import
...
Former-commit-id: f778112c20
[formerly d533c5c08d
] [formerly 27345f6edf
[formerly c158a7540d23451b864a1464ab64882c3d45386d]]
Former-commit-id: 27345f6edf
Former-commit-id: 089dfc87e6
2013-03-29 09:09:32 -05:00
David Gillingham
fddd42615d
Issue #1837 : Provide better error logging when a map referenced in localMaps.py cannot be found in the database.
...
Change-Id: I2400f46f8010ff312c0943b3d08c89d6ce34c5e0
Former-commit-id: 170f252bdd
[formerly 8a7c965eaa
] [formerly c9ed59b0e0
[formerly 8b98836e103e082ccf266e1030b5fd3351095618]]
Former-commit-id: c9ed59b0e0
Former-commit-id: dbec0fa00f
2013-03-28 17:18:43 -05:00
Steve Harris
bec6e9099f
Issue #1782 - restore FFPMGenerator.java
...
Former-commit-id: f01b5fb849
[formerly e67dbb206e
] [formerly 3953f8368b
[formerly 813033f4a2b30a669646b288eb00959922f0e804]]
Former-commit-id: 3953f8368b
Former-commit-id: a74d22efc5
2013-03-28 16:06:54 -05:00
Max Schenkelberg
623c49c3cc
Issue #1638 Added persistIndex route that only persists and indexes
...
Change-Id: I2d53bae64dca80e20777407c62ce7cc7546e3fae
Former-commit-id: d55e7a0eda
[formerly e91406ab10
] [formerly a308b27c2f
[formerly 3d386df8a1def460f81468154964603e7c1edbe8]]
Former-commit-id: a308b27c2f
Former-commit-id: d9a481f542
2013-03-28 15:45:31 -05:00
Ron Anderson
33bcf5fee8
Issue #1774 Fix D2D accumulative parameter time ranges
...
Change-Id: I57b32881a30e89c999dae6db7753da83f9e949c1
Former-commit-id: 27e07ce4a9
[formerly 5bb47b7931
] [formerly b65ecfc151
[formerly aee839a85ec68c7eb80ef1e7236af6cb4666372b]]
Former-commit-id: b65ecfc151
Former-commit-id: 3f2fa771d9
2013-03-28 13:37:29 -05:00
Steve Harris
7bd478fc41
Revert "Replaced with formatted version"
...
This reverts commit e074710e0a
[formerly cf9b267283
] [formerly 18019c07a4
] [formerly ff977fc882
[formerly b741680965
] [formerly 18019c07a4
[formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]].
Former-commit-id: c51c9ea5df
[formerly 29c5918428
] [formerly 8400028e11
[formerly 1c0d9e2058ce98c5de8e046a35bf2a6954b2e3f3]]
Former-commit-id: 8400028e11
Former-commit-id: b614bf53f6
2013-03-28 13:08:16 -05:00
Dustin Johnson
3896cf42f1
Merge "Issue #1839 Change build.edex build.xml to support building work assignment features after main build" into development
...
Former-commit-id: 9bc6dd47b6
[formerly c618169639
] [formerly 3991df64ff
[formerly 88779a4fbd8078d81139b7555525142940999558]]
Former-commit-id: 3991df64ff
Former-commit-id: d900459ab4
2013-03-28 13:07:20 -05:00
Greg Armendariz
e074710e0a
Replaced with formatted version
...
Former-commit-id: ff977fc882
[formerly b741680965
] [formerly 18019c07a4
[formerly d9726bc27ae5387dc5042628b79a9b4239120d08]]
Former-commit-id: 18019c07a4
Former-commit-id: cf9b267283
2013-03-28 12:59:43 -05:00
Dustin Johnson
ee26b669e3
Merge "Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager" into development
...
Former-commit-id: 59393b633a
[formerly 8583a5f785
] [formerly 51bf00bf1c
[formerly bf39f3c73e4de589855abda284c6d2d46543d283]]
Former-commit-id: 51bf00bf1c
Former-commit-id: db5a8b9865
2013-03-28 12:25:12 -05:00
Dustin Johnson
85d6a19a5e
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: I976e69d04ce47fe31cf47c9aff7de1bed786ad17
Former-commit-id: c2edf1dd89
[formerly ab42673848
] [formerly a4e4df02b0
[formerly 59977a0a652352a9128caaaf7d8f041b82941490]]
Former-commit-id: a4e4df02b0
Former-commit-id: 902986256d
2013-03-28 12:14:47 -05:00
Dustin Johnson
d0056996cd
Issue #1840 Fix merge error that removed .classpath
...
Change-Id: Ic199fa594ceecaa5c14a28d0ccb58e49ac728f6e
Former-commit-id: 5e0073f1f9
[formerly 680d2984e1
] [formerly 695c83669e
[formerly f6b91884ba72412a8fad2608eca1490757df2c60]]
Former-commit-id: 695c83669e
Former-commit-id: 25b6eb0eb9
2013-03-28 12:13:23 -05:00
Benjamin Phillippe
af5827f1de
Issue #1802 : Eliminated a call to new on StatsDao in AggregateManager
...
Change-Id: I2c52a222746df7e7a0c8f91682268e25e97ae0ce
Former-commit-id: ec880b7923
[formerly ed9cb5f8f6
] [formerly 6640a65a51
[formerly e9e7f34e87f18120232ed5cc8e00da6cb8bda5d5]]
Former-commit-id: 6640a65a51
Former-commit-id: c4496475a6
2013-03-28 12:08:57 -05:00
Dustin Johnson
1960bcbf11
Issue #1839 Change build.edex build.xml to support building work assignment features after main build
...
Change-Id: If757b326fe851a976e5cd545f48e339cceacb4f9
Former-commit-id: ce37e32e61
[formerly 3be6669f1b
] [formerly 1365d5c9af
[formerly 1f4c7ce21abf2853a424cb4a7c478847dcdd8065]]
Former-commit-id: 1365d5c9af
Former-commit-id: 83f6fb720c
2013-03-28 11:43:24 -05:00
Ben Steffensmeier
e1a619e030
Issue #1821 recalculate 6 hours to be longer.
...
Former-commit-id: 61e0ca3b75
[formerly a9cec71222
] [formerly efbdd3aa8c
[formerly 9ffb12e004e0268f6e9f662a10a6b8d7a1b916ed]]
Former-commit-id: efbdd3aa8c
Former-commit-id: 403da9bfb9
2013-03-28 10:16:11 -05:00
Greg Armendariz
44fcd1a8db
Add source variable
...
Former-commit-id: ae09ebb11f
[formerly 8800080d2a
] [formerly d0d889f11d
[formerly fbd7e7f86b3568a0b04f2b34a072b45a301d8d2d]]
Former-commit-id: d0d889f11d
Former-commit-id: 24fea6f45d
2013-03-28 08:56:50 -05:00
Steve Harris
6e48567370
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml
Former-commit-id: 069ee8a748
[formerly 9a321b6ac8
] [formerly 3073951b3d
[formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]
Former-commit-id: 3073951b3d
Former-commit-id: a4bf236cc7
2013-03-27 22:16:15 -05:00
Richard Peter
b061ba5595
Merge "Issue #1821 Reduce db and pypies requests in grid assembler." into omaha_13.3.1
...
Former-commit-id: 642ff5e320
[formerly 3ba331e9f5
] [formerly 2b207fc6ec
[formerly db45bf80d754e49429e4d6a7fd6a28f50d7fb140]]
Former-commit-id: 2b207fc6ec
Former-commit-id: d8cbd1ff39
2013-03-27 18:32:38 -05:00
Richard Peter
ce746d6228
Merge "Issue #1821 make GridInfoCache more elaborate. Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9" into omaha_13.3.1
...
Former-commit-id: 2a71b9de1b
[formerly 7992b43a7a
] [formerly 6c4f279623
[formerly b0753a969f27d0f7903a42a535066e3ac5b354fd]]
Former-commit-id: 6c4f279623
Former-commit-id: e68173e147
2013-03-27 18:28:01 -05:00
Steve Harris
428ec8a472
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: 979d6a5d8c
[formerly 2a0e399dc8
] [formerly d997aeaee4
[formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]
Former-commit-id: d997aeaee4
Former-commit-id: e67b16bb03
2013-03-27 18:21:05 -05:00
Ben Steffensmeier
1312e2ba34
Issue #1821 Reduce db and pypies requests in grid assembler.
...
Former-commit-id: 6171d60f44
[formerly 60d13f2282
] [formerly 5add905ea7
[formerly 68febf5d9bff68e752d039fddc853a0e5793b05d]]
Former-commit-id: 5add905ea7
Former-commit-id: 37fc71a726
2013-03-27 17:59:58 -05:00
Steve Harris
936e4adda2
13.3.1-14 baseline
...
Former-commit-id: 91a5e4578e
[formerly 9022c500ce
] [formerly 9fba973fd0
[formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9fba973fd0
Former-commit-id: 2ca160caf0
2013-03-27 17:59:34 -05:00
Ben Steffensmeier
60b2259343
Issue #1821 make GridInfoCache more elaborate.
...
Change-Id: Ib64a68ab4e898eba5fe186ac5ac01407964e37d9
Former-commit-id: a31dc1874b
[formerly bc8729d631
] [formerly 4b6d2fd8d1
[formerly c7b4e7c982fb682779b729d1a8a8fb5ff6f5e1d2]]
Former-commit-id: 4b6d2fd8d1
Former-commit-id: e4462ee41a
2013-03-27 17:28:45 -05:00
Benjamin Phillippe
3cc6978718
Issue #1802 Fixes related to DD transaction refactor
...
Change-Id: Ia2a7a4ce990d424ed1e365bd7003fd2ab8630fd1
Former-commit-id: 30be5ce6f9
[formerly 115dc12790
] [formerly 2a14245dce
[formerly 393a469e2f65894a6dd5b58c1431c3d727951eda]]
Former-commit-id: 2a14245dce
Former-commit-id: b0010de8ff
2013-03-27 17:12:52 -05:00
Richard Peter
be2a8e1b16
Merge "Issue #1827 Create registry/datadelivery client features" into omaha_13.3.1
...
Former-commit-id: c11b070571
[formerly c8ae09ab1d
] [formerly 70a7c3c556
[formerly a104b57c33655022bc142b71e909e8fb1b1c022b]]
Former-commit-id: 70a7c3c556
Former-commit-id: de88cceb8c
2013-03-27 17:08:00 -05:00
Dustin Johnson
2591041c9d
Issue #1827 Create registry/datadelivery client features
...
Amend: Add event plugins and their dependencies to client features
Change-Id: Ib80522161740857d4332b84bbedad10e19683602
Former-commit-id: fbcfdd0ca1
[formerly 52c27ec57f
] [formerly 1684507bdb
[formerly 0011ef9ba9d014decf30acc2913fa535562d0de2]]
Former-commit-id: 1684507bdb
Former-commit-id: f27ebfbc1b
2013-03-27 15:38:36 -05:00
Ben Steffensmeier
bc0153dbba
Issue #1821 Speed up GridInfoCache.
...
Change-Id: I14a92d85994c25dc7f80828efd12d2d4e2e70e40
Former-commit-id: bd35a06d51
[formerly 2a13abd32c
] [formerly 6f525a81b4
[formerly fde9f936e53a998f8cde174935d00287e6aaf70c]]
Former-commit-id: 6f525a81b4
Former-commit-id: 72724108b7
2013-03-27 13:21:33 -05:00
Nate Jensen
ccf6175c43
Merge "Issue #1638 Made Map scales more generalized for use outside of D2D" into development
...
Former-commit-id: 7f5b3d6f84
[formerly faf937d3b0
] [formerly f8e5534417
[formerly 5ebb2a9670ef28c759b434ed25e68465b5a2d8ac]]
Former-commit-id: f8e5534417
Former-commit-id: a7548df695
2013-03-27 11:32:19 -05:00
Ron Anderson
dc74b366e9
Merge "Issue #1833 : Add performance log file to ingest and ingestGrib" into omaha_13.3.1
...
Former-commit-id: 60735ddd83
[formerly 841a69ed59
] [formerly 33d78bc7ee
[formerly 9b35437ccfecaf70470a9a96fbc3acacd7cf1405]]
Former-commit-id: 33d78bc7ee
Former-commit-id: 6a393ee4f9
2013-03-27 11:22:48 -05:00
Mike Duff
c143b356ef
Issue #1834 - Filter config file reads for xml only, wrap unmarshalling and log errors
...
Change-Id: I23829b764e1f52e9dee1a1d9701d219e949eb9fa
Former-commit-id: 1beb6e4fa5
[formerly 1958700112
] [formerly 302dbf2cfb
[formerly 5304de6fff49f3db7a3b46427077c7d2d9c0b3f9]]
Former-commit-id: 302dbf2cfb
Former-commit-id: 3d1c1b146c
2013-03-27 10:38:59 -05:00
Richard Peter
6923e10550
Issue #1833 : Add performance log file to ingest and ingestGrib
...
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d
Former-commit-id: 25d4905570
[formerly 5287a3296b
] [formerly b75ceeeeb3
[formerly 53cb92842c43349968b70bb5fec5beb100773b63]]
Former-commit-id: b75ceeeeb3
Former-commit-id: f99242f539
2013-03-26 20:55:42 -05:00
Lee Venable
013748405d
Merge "Issue #1819 Added precision fields for point source configuration." into omaha_13.3.1
...
Former-commit-id: 68e767daaa
[formerly c86daf885b
] [formerly c1adce3a11
[formerly 8753aa9e648778c2eabbf959c1b270ebe5add67c]]
Former-commit-id: c1adce3a11
Former-commit-id: 393e6d9ca1
2013-03-26 14:33:24 -05:00
Richard Peter
9c5ce8e741
Merge "Issue #1783 : Update DatabaseArchiver to stream deserialization of previous records" into omaha_13.3.1
...
Former-commit-id: ce83569845
[formerly b947a52604
] [formerly 7ee513dfed
[formerly b1acf59c03ab308b86843a314d4795f6392de844]]
Former-commit-id: 7ee513dfed
Former-commit-id: 45a2f3f3dd
2013-03-26 12:59:47 -05:00
Steve Harris
5bb29627dc
Merge branch 'omaha_13.3.1' into development
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
Former-commit-id: 4e54025fcd
[formerly 5fcfaf4360
] [formerly 65df96a419
[formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]
Former-commit-id: 65df96a419
Former-commit-id: 346b97a39a
2013-03-26 12:47:40 -05:00
Steve Harris
02147470db
Merge branch 'master_13.3.1' into omaha_13.3.1
...
Former-commit-id: 85104939ac
[formerly e71c69c383
] [formerly 9ff8a94193
[formerly 741a32d9209897e84da068626d28c7d7af47f9c1]]
Former-commit-id: 9ff8a94193
Former-commit-id: b926ff60b3
2013-03-26 12:44:24 -05:00
Steve Harris
4f2e9aec0d
13.3.1-13 baseline
...
Former-commit-id: 792171756f
[formerly c77a452f5a
] [formerly c65f3e68e5
[formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c65f3e68e5
Former-commit-id: 822d05a709
2013-03-26 12:43:07 -05:00
Jonathan Sanchez
a579da7646
Issue #1819 Added precision fields for point source configuration.
...
Former-commit-id: a0a0199266
[formerly 79d87a96e7
] [formerly b0f61cf86c
[formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]
Former-commit-id: b0f61cf86c
Former-commit-id: eb13af2f50
2013-03-26 12:29:18 -05:00
Steve Harris
ee009dc2d8
Merge "Issue #1782 : Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge." into development
...
Former-commit-id: 9ed8f85b79
[formerly 1f28f6b807
] [formerly 305994e220
[formerly b59167da8d42b23fadd19eb8f186d992a5c68bdd]]
Former-commit-id: 305994e220
Former-commit-id: b1071636a7
2013-03-26 12:27:54 -05:00
David Gillingham
040dc9075c
Issue #1782 : Fix com.raytheon.edex.plugin.gfe build break from 13.3.1-12 merge.
...
Change-Id: I0833377d1501122200ede42b5ec30ec7bf9b2dfb
Former-commit-id: 6fe3d5dc28
[formerly c5c7e31983
] [formerly 54511a95db
[formerly 497aa460d6119f13bf6870b78454237252b68752]]
Former-commit-id: 54511a95db
Former-commit-id: 6188c8bd40
2013-03-26 12:14:22 -05:00
Ben Steffensmeier
f983e5d705
Issue #1782 fix merge problems related to graphics API.
...
Former-commit-id: 0aad550439
[formerly 2b898e58c7
] [formerly 6edee13cdd
[formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]
Former-commit-id: 6edee13cdd
Former-commit-id: 76a6213807
2013-03-26 12:06:45 -05:00