[riot-commits] [RIOT-OS/RIOT] a3b754: Remove carriage returns

authmillenon mlenders at inf.fu-berlin.de
Thu Aug 15 10:30:48 CEST 2013


  Branch: refs/heads/master
  Home:   https://github.com/RIOT-OS/RIOT
  Commit: a3b754b662cd29449179e91a76d03891450be6c3
      https://github.com/RIOT-OS/RIOT/commit/a3b754b662cd29449179e91a76d03891450be6c3
  Author: authmillenon <mlenders at inf.fu-berlin.de>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M cpu/arm_common/include/VIC.h
    M cpu/lpc2387/asmfunc.s
    M cpu/lpc2387/include/lpc23xx.h
    M doc/doxygen/src/riot-footer.html
    M sys/net/destiny/destiny.h
    M sys/net/destiny/in.h
    M sys/net/destiny/socket.h
    M sys/net/destiny/tcp.h
    M sys/net/destiny/tcp_hc.c
    M sys/net/destiny/tcp_hc.h
    M sys/net/destiny/tcp_timer.c
    M sys/net/destiny/tcp_timer.h
    M sys/net/destiny/udp.c
    M sys/net/destiny/udp.h
    M sys/net/net_help/msg_help.c
    M sys/net/net_help/msg_help.h
    M sys/net/net_help/net_help.c
    M sys/net/net_help/net_help.h

  Log Message:
  -----------
  Remove carriage returns

Git for windows handles those by itself


  Commit: e2c201f2e074b53da0b15ad6347ec4c5eeaf1045
      https://github.com/RIOT-OS/RIOT/commit/e2c201f2e074b53da0b15ad6347ec4c5eeaf1045
  Author: authmillenon <mlenders at inf.fu-berlin.de>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M cpu/arm_common/include/VIC.h
    M cpu/lpc2387/asmfunc.s
    M cpu/lpc2387/include/lpc23xx.h
    M doc/doxygen/src/riot-footer.html
    M sys/net/destiny/destiny.h
    M sys/net/destiny/in.h
    M sys/net/destiny/socket.h
    M sys/net/destiny/tcp.h
    M sys/net/destiny/tcp_hc.c
    M sys/net/destiny/tcp_hc.h
    M sys/net/destiny/tcp_timer.c
    M sys/net/destiny/tcp_timer.h
    M sys/net/destiny/udp.c
    M sys/net/destiny/udp.h
    M sys/net/net_help/msg_help.c
    M sys/net/net_help/msg_help.h
    M sys/net/net_help/net_help.c
    M sys/net/net_help/net_help.h

  Log Message:
  -----------
  Merge branch 'remove_carriage_returns' of github.com:authmillenon/RIOT into authmillenon-remove_carriage_returns

Conflicts:
	sys/net/destiny/in.h
	sys/net/destiny/socket.h
	sys/net/destiny/tcp.h
	sys/net/destiny/tcp_hc.c
	sys/net/destiny/tcp_hc.h
	sys/net/destiny/tcp_timer.c
	sys/net/destiny/udp.c
	sys/net/destiny/udp.h


Compare: https://github.com/RIOT-OS/RIOT/compare/9fdae28876fc...e2c201f2e074


More information about the commits mailing list