You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/07 19:05:52 UTC
[2/2] incubator-netbeans git commit: Merge branch 'pr/66'
Merge branch 'pr/66'
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/cdf0df38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/cdf0df38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/cdf0df38
Branch: refs/heads/master
Commit: cdf0df38c06e9b242f1ef7cd959bfdb24cb8e700
Parents: 7df6aa3 da72fc1
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sat Oct 7 21:05:37 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sat Oct 7 21:05:37 2017 +0200
----------------------------------------------------------------------
.../settings/storage/fonts-and-colors-2.xml | 20 ++++++++++++++++++++
.../settings/storage/fonts-and-colors-3.xml | 20 ++++++++++++++++++++
.../settings/storage/fonts-and-colors-4.xml | 20 ++++++++++++++++++++
.../settings/storage/fonts-and-colors-5.xml | 20 ++++++++++++++++++++
.../storage/fonts-and-colors-all-languages.xml | 20 ++++++++++++++++++++
.../settings/storage/fonts-and-colors.xml | 20 ++++++++++++++++++++
.../editor/settings/storage/key-bindings.xml | 20 ++++++++++++++++++++
.../editor/settings/storage/preferences.xml | 20 ++++++++++++++++++++
.../preferences/preferences-all-languages.xml | 20 ++++++++++++++++++++
.../storage/preferences/preferences-testA-1.xml | 20 ++++++++++++++++++++
.../storage/preferences/preferences-testA-2.xml | 20 ++++++++++++++++++++
11 files changed, 220 insertions(+)
----------------------------------------------------------------------