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/13 19:56:02 UTC
[3/3] incubator-netbeans git commit: Merge branch 'pr/128'
Merge branch 'pr/128'
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/329f56a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/329f56a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/329f56a3
Branch: refs/heads/master
Commit: 329f56a3cc8409bac48acae48c37c18b4bd6b6ac
Parents: 3a96539 eec8f6a
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Fri Oct 13 21:54:20 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Fri Oct 13 21:54:20 2017 +0200
----------------------------------------------------------------------
.gitignore | 3 +-
.../AdvancedMedia/nbproject/genfiles.properties | 16 +++++++
.../AdvancedMedia/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../AudioVisualizer3D/nbproject/jfx-impl.xml | 20 +++++++++
.../BrickBreaker/nbproject/genfiles.properties | 16 +++++++
.../BrickBreaker/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../ChangeListener/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../ChartAdvancedArea/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../ChartAdvancedBar/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../ChartAdvancedPie/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../ChartAdvancedScatter/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../ChartAudioArea/nbproject/jfx-impl.xml | 20 +++++++++
.../ChartAudioBar/nbproject/genfiles.properties | 16 +++++++
.../ChartAudioBar/nbproject/jfx-impl.xml | 20 +++++++++
.../ChartLine/nbproject/genfiles.properties | 16 +++++++
.../ChartLine/nbproject/jfx-impl.xml | 20 +++++++++
.../ColorPicker/nbproject/genfiles.properties | 16 +++++++
.../ColorPicker/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../ColorfulCircles/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../CreateAdvancedStage/nbproject/jfx-impl.xml | 20 +++++++++
.../Cube3D/nbproject/genfiles.properties | 16 +++++++
javafx2.samples/Cube3D/nbproject/jfx-impl.xml | 20 +++++++++
.../CubeSystem3D/nbproject/genfiles.properties | 16 +++++++
.../CubeSystem3D/nbproject/jfx-impl.xml | 20 +++++++++
.../DigitalClock/nbproject/genfiles.properties | 16 +++++++
.../DigitalClock/nbproject/jfx-impl.xml | 20 +++++++++
.../DisplayShelf/nbproject/genfiles.properties | 16 +++++++
.../DisplayShelf/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../FXML-LoginDemo/nbproject/jfx-impl.xml | 20 +++++++++
.../FXML-LoginDemo/src/demo/profile.fxml | 47 ++++++++------------
.../Fireworks/nbproject/genfiles.properties | 16 +++++++
.../Fireworks/nbproject/jfx-impl.xml | 20 +++++++++
.../HTMLEditorApp/nbproject/genfiles.properties | 16 +++++++
.../HTMLEditorApp/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../KeyStrokeMotion/nbproject/jfx-impl.xml | 20 +++++++++
.../MouseEvents/nbproject/genfiles.properties | 16 +++++++
.../MouseEvents/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../PaginationDemo/nbproject/jfx-impl.xml | 20 +++++++++
.../PuzzlePieces/nbproject/genfiles.properties | 16 +++++++
.../PuzzlePieces/nbproject/jfx-impl.xml | 20 +++++++++
.../StopWatch/nbproject/genfiles.properties | 16 +++++++
.../StopWatch/nbproject/jfx-impl.xml | 20 +++++++++
.../SwingInterop/nbproject/genfiles.properties | 16 +++++++
.../SwingInterop/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../TimelineEvents/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../TimelineInterpolator/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../TransitionPath/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../TransitionRotate/nbproject/jfx-impl.xml | 20 +++++++++
.../nbproject/genfiles.properties | 16 +++++++
.../WebViewBrowser/nbproject/jfx-impl.xml | 20 +++++++++
.../Xylophone/nbproject/genfiles.properties | 16 +++++++
.../Xylophone/nbproject/jfx-impl.xml | 20 +++++++++
72 files changed, 1280 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/329f56a3/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 1992bcd,b6f4afd..a7d14ae
--- a/.gitignore
+++ b/.gitignore
@@@ -42,6 -43,9 +42,7 @@@
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl/
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl20061109.xsd
/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/wadl200902.xsd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLNamespace.xsd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema-instance.xsd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.dtd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/XMLSchema.xsd
-/xml.catalog/src/org/netbeans/modules/xml/catalog/resources/datatypes.dtd
+/xml/test/qa-functional/data/DTDActionsTestProject/nbproject/private/
+/xml/test/qa-functional/data/ActionsTestProject/nbproject/private/
- /xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/private/
++/xml/test/qa-functional/data/CoreTemplatesTestProject/nbproject/private/
+ /javafx2.samples/FXML-LoginDemo/nbproject/private/