success reassembly udp assembly
	deleted:    dulist.o
	deleted:    ip_reassembly.o
	deleted:    ip_test
	deleted:    ip_test_full
	deleted:    m_queue.o
	deleted:    multi_timer.o
	deleted:    packet_collect.o
	deleted:    packet_parse.o
	deleted:    server.o
	deleted:    server_test
Merge branch 'master' of github.com:likeyiyy/packet_collect

Conflicts:
	packet_collect.c

	modified:   Makefile
	new file:   m_queue.o
	modified:   packet_collect.c
	new file:   packet_collect.o
	new file:   packet_parse.o
	modified:   server.c
	new file:   server.o
	new file:   server_test
how to use github who can tell me
how to use github who can tell me now