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

134 commits

Author SHA1 Message Date
Steve Harris
d73efe8e86 Merge branch '13.2.1_delivery' into development 
Former-commit-id: 4bc8e9ab5c [formerly 4bc8e9ab5c [formerly 30e1ae8f245a60c780fcc79f54795ece0b28088f]]
Former-commit-id: 5ee47e098d
Former-commit-id: 3ad515e28f
 2013-02-06 11:12:01 -06:00
Steve Harris
f028c16f79 Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java

Former-commit-id: a16ac7819c [formerly a16ac7819c [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]
Former-commit-id: 6c6b53679b
Former-commit-id: 28ddc9bad8
 2013-02-06 11:08:53 -06:00
Steve Harris
bb0759d5ad 13.2.1-5 baseline 
Former-commit-id: 232734091d [formerly 232734091d [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]
Former-commit-id: 146fcc6da8
Former-commit-id: 1c602ec3a7
 2013-02-06 11:02:32 -06:00
Bryan Kowal
2fafc6a34b Issue #1577 - deploy-install and AWIPS II ant task updates 
- includegen will now fail if a plugin is included in two or more features
- includegen will no longer prepend component-deploy.xml to the plugins in the list that it generates
- removed a plugin from the ncep feature that was also in the cots feature
- the includegen failure will cause deploy-install to fail
- peer review comments; excluding significant re-factoring

Change-Id: I2e317b1ef0764da3ddd9cd6ef10555ca4bf8bd3f

Former-commit-id: 7815b651bb [formerly 7815b651bb [formerly 7659fb8044f3f4715c9ea7c875eda36b7c5dd136]]
Former-commit-id: 5fea87f1dd
Former-commit-id: 99994d3151
 2013-02-05 13:25:15 -06:00
Steve Harris
27706b8dcb 13.2.1-2 baseline 
Former-commit-id: 7a7f7c45ca [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: c3e4551dfa
Former-commit-id: 1153d80c5b
 2013-01-25 09:07:12 -06:00
Bryan Kowal
0c5323fadb Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path 
Former-commit-id: a2f745ec54 [formerly a2f745ec54 [formerly 42a05fc36d0ba3036a7e056d8871f684abf986c9]]
Former-commit-id: 5d769d8a8d
Former-commit-id: 2bb5377a4d
 2013-01-17 09:59:11 -06:00
Bryan Kowal
e9e16abea2 Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path 
Former-commit-id: 2ed28bed93 [formerly 2ed28bed93 [formerly 18676a8f73c7ac0eb2ce0ff25cf3c66ae1f72f02]]
Former-commit-id: 8c118e791b
Former-commit-id: 0a39b4ddf1
 2013-01-15 18:46:46 -06:00
Bryan Kowal
34518b7cf6 Issue #1469 - updated for compatibility with recent changes to Pypies. 
Former-commit-id: 02c16b6f3d [formerly 02c16b6f3d [formerly 417ecdcc5b9907b95856571d5d03fa12099eb3f6]]
Former-commit-id: d710e987e4
Former-commit-id: 37d1aee965
 2013-01-15 16:09:42 -06:00
Bryan Kowal
290167ac16 Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict. 
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: e2a12845d3 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]
Former-commit-id: 4db9c6c321
Former-commit-id: c1330e8121
 2013-01-15 14:56:01 -06:00
Richard Peter
096134d917 Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: 1318f53902 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: b8e42dabc0
Former-commit-id: aa9e16b038
 2013-01-14 17:38:38 -06:00
Steve Harris
066c14dcd2 13.1.2-8 baseline 
Former-commit-id: e6217a17de [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 3caf592e83
 2013-01-11 16:19:07 -05:00
Steve Harris
775a338b90 13.1.2-7 baseline 
Former-commit-id: 4f86b07eb0 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 42189b5f88
Former-commit-id: b7f1dbe72b
 2013-01-11 16:12:09 -05:00
Ben Steffensmeier
8fb09ab2cb Issue #1362 add null chack in nsharp mouse handler. 
Former-commit-id: 1186724fa8 [formerly 1186724fa8 [formerly 4ae38765c9a6815050d30b307b4a364b617c49aa]]
Former-commit-id: a836aee481
Former-commit-id: 3a4661685a
 2013-01-08 18:17:24 -06:00
Steve Harris
05bdc0ecd2 13.1.2-6 baseline 
Former-commit-id: 8e5f9e0e6c [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
 2013-01-06 14:55:11 -06:00
Steve Harris
b6fa9b4858 13.1.2-2 baseline 
Former-commit-id: c0c1d56f3a [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
 2013-01-06 14:32:24 -06:00
Max Schenkelberg
09f1499af9 Issue #1329 Fixed nsharp issue that came about after changing when the renderable display sets itself on the descriptor. 
Change-Id: I1a5bcb4ba18a8dd73f8857c5bd4256529af57fde

Former-commit-id: fabb9bbcff [formerly fabb9bbcff [formerly 4b62eb9cb14005f5f1a4ab660336d2c6e6db0592]]
Former-commit-id: 7e3273db95
Former-commit-id: 904270b99b
 2012-12-20 17:14:34 -06:00
Steve Harris
ebcc9975c4 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: 43ddfe98c4 [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
 2012-12-11 08:45:53 -06:00
Steve Harris
ec2cdc1593 12.12.1-8 baseline 
Former-commit-id: 19962f41ba [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 5093a7c442
Former-commit-id: ee06a94735
 2012-12-06 09:02:51 -06:00
Max Schenkelberg
b8b98a78c3 Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins 
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: b648c5828e [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]
Former-commit-id: ed77d56a84
Former-commit-id: b24440cc37
 2012-11-29 10:29:36 -06:00
Nate Jensen
25602f0183 Merge "Issue #189 changes to mappings and ncep merge from code review Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47" into development 
Former-commit-id: 49c2079963 [formerly 49c2079963 [formerly 219d5cd37e412c47cf12eebb6849c5c233163f16]]
Former-commit-id: 31637efbbc
Former-commit-id: 8944e220f6
 2012-11-14 16:09:00 -06:00
Dustin Johnson
ff33643234 Merge branch 'ss_builds' (12.12.1-4) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java

Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71

Former-commit-id: bff32bbe58 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]
Former-commit-id: 0d1d663f41
Former-commit-id: e25b7c312b
 2012-11-14 14:41:57 -06:00
Steve Harris
493f335c0b 12.12.1-4 baseline 
Former-commit-id: 85130eb611 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
 2012-11-14 14:19:20 -06:00
Ben Steffensmeier
84abe4fa4f Issue #189 changes to mappings and ncep merge from code review 
Change-Id: Ia44b66535dbbf36a6e0b99cd547f0dc161af6a47

Former-commit-id: 2c8f3f09ac [formerly 2c8f3f09ac [formerly 9ed60c53dd17891f81e5c01c3b86933c8aff2ba4]]
Former-commit-id: 2d864c3b09
Former-commit-id: 91254adfd6
 2012-11-14 12:22:53 -06:00
Ben Steffensmeier
40a07f8998 Issue #189 merge ncep changes to unified grid. 
Change-Id: I3dac0d3785f093c095f50799890744919edb1891

Former-commit-id: e6b0751f5c [formerly e6b0751f5c [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]
Former-commit-id: fbed67a208
Former-commit-id: 7c9341a3a6
 2012-11-08 14:34:55 -06:00
Dustin Johnson
6613c51d3b 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: 064ef82d1e [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
 2012-11-08 09:57:16 -06:00
Steve Harris
a5be98d6de 12.12.1-1 baseline 
Former-commit-id: e4bd20a515 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
 2012-11-07 12:41:20 -06:00
Dustin Johnson
4d9c945388 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: 98d7beae50 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
 2012-11-01 13:36:06 -05:00
Richard Peter
940d986f6d Issue #1257: Update PurgeRules to not be hard linked to path keys 
Change-Id: I8eb68c527ddafae2ee2b3af8d22eed905f547ea4

Former-commit-id: 275398778f [formerly 275398778f [formerly 73bca27407552c864765d5924e8609a253493f4c]]
Former-commit-id: 886375172b
Former-commit-id: bd1d87363a
 2012-10-31 18:19:44 -05:00
Ben Steffensmeier
38b0dafe0b merge branch Unifeid_Grid into developement 
Former-commit-id: d0a2ed32b5 [formerly d0a2ed32b5 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: b6a1563bb2
Former-commit-id: 92fd247ccc
 2012-10-30 12:24:54 -05:00
Ben Steffensmeier
dd5ab10b61 merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: 6a9ff88b33 [formerly 6a9ff88b33 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: c2934ae7a5
Former-commit-id: a77d2097f8
 2012-10-25 12:22:11 -05:00
Ben Steffensmeier
3f608d0843 Issue #189 modify nsharp to use grid data. 
Former-commit-id: 52c37c114a [formerly 52c37c114a [formerly 4c364f429bbcaddfa1f23ae31a95ca25cb6baef9]]
Former-commit-id: db1efee514
Former-commit-id: b9cd33b79b
 2012-10-24 13:07:41 -05:00
Steve Harris
dff8d5de9c 12.11.1-5 baseline 
Former-commit-id: 03f3f3c36a [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
 2012-10-18 15:46:42 -05:00
Steve Harris
560f0d9cc3 12.11.1-4 baseline 
Former-commit-id: d3497e47eb [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Richard Peter
a8b4b8ac8b Issue #1257: Fix NSharp point retrieval 
Change-Id: I50e27a10c987dfb373c8431bff7a18f50563f4b4

Former-commit-id: 25fe0aef5b [formerly 25fe0aef5b [formerly 3a6ee9b778035d62285be6d1e5ff08f240ba8c51]]
Former-commit-id: 3fa2a8b894
Former-commit-id: d434d967dd
 2012-10-15 19:40:20 -05:00
Richard Peter
881582885c Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path. 
Change-Id: I426718d765dfad3aba24e504b2d01ab9b194625f

Former-commit-id: ca0c9b7502 [formerly ca0c9b7502 [formerly 535a9c40538da25dd493c7bdfa6a731160819f85]]
Former-commit-id: bcb0560291
Former-commit-id: ce85c8e1a6
 2012-10-15 09:52:14 -05:00
Ben Steffensmeier
b2fdd9283d Merge branch 'ss_builds' into Unified_Grid 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: 8b7256b1ae [formerly 8b7256b1ae [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]
Former-commit-id: 266a2f317f
Former-commit-id: fed5a35af3
 2012-10-12 12:45:50 -05:00
Ben Steffensmeier
18e2457845 Issue #1217 commit code from Ncep to fix the problem 
Former-commit-id: d566733aae [formerly d566733aae [formerly 608994193c845cfc60431b3c416c61736189a160]]
Former-commit-id: bb7b9d18e0
Former-commit-id: 75d1e65c29
 2012-10-09 16:20:39 -05:00
Ben Steffensmeier
642f58ca49 Issue #1131 merge latest changes to nsharp from ncep 
Change-Id: I784a0f60d63b6598457f9c53e466888506b7f320

Former-commit-id: b266c68be3 [formerly b266c68be3 [formerly 3c62033bdd4129c718c30af78576a8f850398f01]]
Former-commit-id: 01a13dee33
Former-commit-id: c367592b02
 2012-09-28 15:35:11 -05:00
Steven Harris
a544be6d83 12.11.1-1 baseline 
Former-commit-id: 618aa3f316 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
 2012-09-27 15:57:45 -05:00
Ben Steffensmeier
190f0754fb Issue #1213 update nsharp resources to clear target on dispose. 
Former-commit-id: 60ca8a3011 [formerly 60ca8a3011 [formerly b1df98f68b5927d71230efa6f1f49ba3023a9a6f]]
Former-commit-id: 752a0078d4
Former-commit-id: 1df5ee74aa
 2012-09-25 10:54:57 -05:00
Ben Steffensmeier
8fc544b44f Issue #1131 merge multipane nsharp into D2D. 
Former-commit-id: c04649842a [formerly c04649842a [formerly 14310917dffa9bb2a805f3ff8fc98ccfdd1c9d92]]
Former-commit-id: 2606f968cb
Former-commit-id: 036aa08f2c
 2012-09-20 17:28:54 -05:00
Ben Steffensmeier
a28984c40c Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin 
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: bd8eb7fc15 [formerly bd8eb7fc15 [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]
Former-commit-id: 05849f634d
Former-commit-id: b547d9dd8f
 2012-09-18 15:19:05 -05:00
Max Schenkelberg
1badd11cdb 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: 7294025e26 [formerly 7294025e26 [formerly 64194223bc30a629b32ca8aa5cefbcfdf8fd6776]]
Former-commit-id: 2f8f1ce9b2
Former-commit-id: c26d21d908
 2012-09-11 16:27:41 -05:00
Steve Harris
faadb51529 12.10.1-3 baseline 
Former-commit-id: 21f430062b [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
 2012-09-11 16:00:38 -05:00
Steve Harris
e9582cb789 Merge branch 'ss_builds' (12.10.1-1) into development 
Former-commit-id: bba4eb12d0 [formerly bba4eb12d0 [formerly 3eacf0da611b09faa416580b8d2db5bdc9af2d11]]
Former-commit-id: af106f1d29
Former-commit-id: 53e29f59e4
 2012-09-04 12:11:03 -05:00
Steve Harris
d65f35ffe9 12.10.1-1 baseline 
Former-commit-id: 195158c004 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
 2012-09-04 12:07:27 -05:00
Steve Harris
0b647c0c9d Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development 
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: 91e39617cb [formerly 91e39617cb [formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: a71dac6cad
Former-commit-id: 87a602dfee
 2012-08-27 09:53:55 -05:00
Steve Harris
9b5c2094ed 12.9.1-5 baseline 
Former-commit-id: 61f269f54c [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
 2012-08-21 15:27:03 -05:00
Ben Steffensmeier
d9f68af5ad Issue #666 fix collaboration message compose problems with ncp keybindings 
Former-commit-id: 3f0b2e474c [formerly 3f0b2e474c [formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]
Former-commit-id: 8e971abbd8
Former-commit-id: 2c5cfe6d98
 2012-08-17 16:16:20 -05:00
Steve Harris
63bcadf121 12.9.1-1 baseline 
Former-commit-id: 31ae7ea218 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 79ce6cfd97
Former-commit-id: 0c5d9e2416
 2012-08-15 13:59:00 -05:00