xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui
History
Bryan Kowal e05b247e3b Merge branch 'ss_sync' (OB12.6.1-10) into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly 455d7b90a9 [formerly b1b294c401] [formerly a33740e915] [formerly b87b66abc5 [formerly a33740e915 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]]]]
Former-commit-id: b87b66abc5
Former-commit-id: dfd75b4c72 [formerly b4917e6708] [formerly 351fe6f4caaff528740139f88451b1dae35f0c83 [formerly 9a7d0492fe]]
Former-commit-id: 0eec5560d9e68707684a8349e50debb048bda384 [formerly 611925412d]
Former-commit-id: 2e5a850d28
2012-06-27 17:21:48 -05:00
..
actions Issue #697 added support for multiple editors 2012-06-13 17:52:11 -05:00
cmenu Revert "12.6.1-10 baseline" 2012-06-21 08:51:08 -05:00
color Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
dialogs 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
editor Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
input Issue #239 Added remote capability injection code through factory 2012-04-05 13:52:20 -05:00
jobs Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
keys Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
panes Issue #697 added support for multiple editors 2012-06-13 17:52:11 -05:00
parameter/converters Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
perspectives Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it. 2012-06-21 16:07:20 -05:00
statusline Manual merge of SS OB12.1.2-4 changes into ss_sync 2012-02-17 10:55:02 -06:00
tools Issue #26 fix classes using HandlerUtil.getActiveEditor() for tear off menus 2012-02-07 11:45:28 -06:00
views Issue #659 fix floating view issue when minimize happened 2012-06-13 10:04:12 -05:00
widgets Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
DetachedViewListener.java 12.5.1-15 baseline 2012-06-08 13:39:48 -05:00
EditorUtil.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
HistoryList.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
MenuLoader.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
UiPlugin.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
UiUtil.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
VizWorkbenchManager.java 12.5.1-2 baseline 2012-05-03 19:17:13 -05:00