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
af863d9514
2 changed files with 1 additions and 1 deletions
  1. 0
    0
      src/netz/view/ChatView.form
  2. 1
    1
      src/netz/view/ChatView.java

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


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

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

import netz.view.*;


Loading…
Cancel
Save