Commit Graph

5 Commits

Author SHA1 Message Date
Sebastian Kaspari 59674e25d1 Removed damned windows carriage returns (\r) 2010-04-14 21:41:55 +02:00
Sebastian Kaspari b597e149ff Merge branch 'integration' of github.com:pocmo/Yaaic into integration
Conflicts:
	src/org/jibble/pircbot/IdentServer.java
	src/org/jibble/pircbot/InputThread.java
	src/org/jibble/pircbot/OutputThread.java
	src/org/jibble/pircbot/PircBot.java
2010-04-06 00:48:35 +02:00
kell 6d01720ca6 added getDescription and help command 2010-03-26 19:05:37 +01:00
Sebastian Kaspari 81c24c5128 Removed logging from PircBot 2010-03-21 15:42:53 +01:00
Sebastian Kaspari 1eee92fc30 Refactored nearly everything 2009-12-17 21:27:57 +01:00