warning: refname 'origin' is ambiguous.
warning: refname 'origin' is ambiguous.
! [dev] Adding the Packet module skeleton and added it to Makefile
 ! [devpacket] Adding the Packet module skeleton and added it to Makefile
  ! [devpacket2] Merge branch 'master' of ssh://sneuro/git/nsync into devpacket2
   ! [devpacket3] Merge branch 'master' of ssh://sneuro/git/nsync into devpacket2
    * [master] Merge branch 'master' of ssh://sneuro/git/nsync into devpacket2
     ! [new] Merge branch 'master' of ssh://sneuro/git/nsync into new
      ! [origin] Merge branch 'master' of ssh://sneuro/git/nsync into devpacket2
-------
  --- - [devpacket2] Merge branch 'master' of ssh://sneuro/git/nsync into devpacket2
  ++* + [devpacket2^2] the core module should be operationnal and fixed the client and server
  ++* + [devpacket2^] Added initial code to the server module
  ++* + [devpacket2~2] fixed a very small typo that made the program not compilable.
  ++* + [devpacket2~3] Fixed the client module so it also sends the header part.
  ++* + [devpacket2~4] Initial implementation of the client code.
  ++* + [devpacket2~5] I did esthetic changes to the Packet module.
  ++* + [devpacket2~6] Coded the Packet_Reset() function.
  ++* + [devpacket2~7] Implemented the new Core module and edited the Makefile
  ++* + [devpacket2~8] implemented a first version of the new packet module.
  ++* + [devpacket2~9] implemented a working but untested version of the packet
  ++* + [devpacket2~10] Adding the Packet module skeleton and added it to Makefile
++      [dev] Adding the Packet module skeleton and added it to Makefile
--      [dev^] Merge branch 'master' of ssh://sneuro/git/nsync into dev
++++* + [devpacket2~11] fixed the version argument. Implemented all the packet structs that
--      [dev~2] Merge branch 'master' of ssh://sneuro/git/nsync into dev
++++* + [devpacket2~12] Removed int Server_Poll and Client_Poll and replaced it by static int
++++* + [devpacket2~13] Fixed includes in the client and server modules, Added SendPacket function to
++++* + [devpacket2~14] Created some modules with the include file, added TODO file, and modified main.c a bit.
++      [dev~3] Removed int Server_Poll and Client_Poll and replaced it by static int
++      [dev~4] Fixed includes in the client and server modules, Added SendPacket function to
++      [dev~5] Created some modules with the include file, added TODO file, and modified main.c a bit.
++++* + [devpacket2~15] Implemented 3 new interface functions to the main module
     -  [new] Merge branch 'master' of ssh://sneuro/git/nsync into new
++++*++ [devpacket2~16] Modified Makefile to add server and client modules