Browse Source

Merge origin/master

Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
master
BakeOrDie 3 years ago
parent
commit
9db2d425c1

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

@@ -15,7 +15,7 @@ import javax.swing.WindowConstants;
import netz.controller.BtnController;
import netz.controller.ChatController;
import netz.model.ChatModel;
import netz.view.ChatView;
import netz.view2.ChatView;

/**
* Builder Class

+ 1
- 1
src/netz/controller/BtnController.java View File

@@ -10,7 +10,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.logging.Logger;
import netz.model.ChatModel;
import netz.view.ChatView;
import netz.view2.ChatView;
import ohmlogger.OhmLogger;

/**

+ 1
- 1
src/netz/controller/ChatController.java View File

@@ -10,7 +10,7 @@ import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.logging.Logger;
import netz.model.ChatModel;
import netz.view.ChatView;
import netz.view2.ChatView;
import ohmlogger.OhmLogger;

/**

src/netz/view/ChatView.form → src/netz/view2/ChatView.form View File


src/netz/view/ChatView.java → src/netz/view2/ChatView.java View File

@@ -3,9 +3,7 @@
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package netz.view;

import netz.view.*;
package netz.view2;

/**
*

Loading…
Cancel
Save