duerrha71912/chat_prog
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	src/wuerfelthreads/Start.java
	src/wuerfelthreads/view/WuerfelView.form
	src/wuerfelthreads/view/WuerfelView.java
This commit is contained in:
BakeOrDie committed 2020-12-09 11:42:40 +01:00
1 parent 368575442f
commit af863d9514
2 files changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/netz/view2/ChatView.form → src/netz/view/ChatView.form
View File
File renamed without changes.
src/netz/view2/ChatView.java → src/netz/view/ChatView.java
+1 -1
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.*;