Merge branch 'master' into feature-packetnames

Conflicts:
	lib/protocol.js
This commit is contained in:
roblabla 2014-03-31 00:01:49 +02:00
commit ffef3f97b5

View File

@ -29,7 +29,7 @@ var packets = {
status: {
toClient: {
server_info: {id: 0x00, fields: [
{ name: "response", type: "string" }
{ name: "response", type: "ustring" }
]},
ping: {id: 0x01, fields: [
{ name: "time", type: "long" }