Browse Source

Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
master
BakeOrDie 4 years ago
parent
commit
10128a50b0
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      src/netz/Start.java

+ 2
- 2
src/netz/Start.java View File



/** /**
* Builder Class * Builder Class
* @author le
* @author chris, hd
*/ */
public class Start public class Start
{ {
} }


public static void main()
public static void main(String[] args)
{ {
try try
{ {

Loading…
Cancel
Save