7u83
/
OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge origin/master 

Conflicts:
	nbproject/private/private.xml
This commit is contained in:
7u83 2017-11-19 17:26:32 +01:00
parent 08dc2b6ba3 2e34143467
commit 5c16434416
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nbproject/private/private.xml
View File

@ -4,10 +4,13 @@
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group>
<file>file:/home/tube/NetBeansProjects/SeSim/src/chart/MasterChart.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/chart/painter/ChartCrossPainter.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/sesim/OHLCData.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/resources/files/defaultcfg.json</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/sesim/AutoTraderInterface.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/chart/painter/XLegendPainter.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/chart/painter/LineChartPainter.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/nbproject/private/private.xml</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/sesim/AutoTraderGui.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/sesim/AutoTraderLoader.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/gui/Globals.java</file>
@ -16,9 +19,11 @@
<file>file:/home/tube/NetBeansProjects/SeSim/.git/config</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/chart/painter/OHLCChartPainter.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/indicators/RSIIndicator.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/chart/SuperDlg.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/sesim/Indicator.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/sesim/SeSimClassLoader.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/sesim/Order.java</file>
<file>file:/home/tube/NetBeansProjects/SeSim/src/chart/Chart.java</file>
</group>
</open-files>
</project-private>