Lucas Pleß cda52cc452 Merge remote-tracking branch 'origin/master' ... Conflicts: src/de/ctdo/crashtest/BuntiClient.java src/de/ctdo/crashtest/Steuerung.java src/de/ctdo/crashtest/SteuerungFrame.java		2012-06-06 09:15:25 +02:00
.idea	fixes for generating correct jar file	2012-06-06 00:59:09 +02:00
libs	adding IRC support. currently with sockets server, will be removed.	2012-06-01 03:48:20 +02:00
src	Merge remote-tracking branch 'origin/master'	2012-06-06 09:15:25 +02:00
.gitignore	building on statemachine	2012-05-10 15:53:18 +02:00
crashteststeuerung.iml	fixes for generating correct jar file	2012-06-06 00:59:09 +02:00