[Qemu-commits] [qemu/qemu] 3b6bb2: add scripts/git.orderfile

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3b6bb28a6c5ce35e652902661a23d643f02531c8
      
https://github.com/qemu/qemu/commit/3b6bb28a6c5ce35e652902661a23d643f02531c8
  Author: Gerd Hoffmann <address@hidden>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    A scripts/git.orderfile

  Log Message:
  -----------
  add scripts/git.orderfile

Based on a old patch by Laszlo.
Time to get this in ...

Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Emilio G. Cota <address@hidden>
Message-id: address@hidden


  Commit: a62e20f6f84d747e55891a0d8aadd0737297571e
      
https://github.com/qemu/qemu/commit/a62e20f6f84d747e55891a0d8aadd0737297571e
  Author: Gerd Hoffmann <address@hidden>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    A .editorconfig

  Log Message:
  -----------
  add editorconfig

Add a .editorconfig file for qemu.  Specifies the indent and tab style
for various files (C code and Makefiles for starters).  Most popular
editors support this either natively or via plugin.

Check http://editorconfig.org/ for details.

Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden


  Commit: 8dbcd0e5e7cdef9ce0532f454a40e64bc2a1c283
      
https://github.com/qemu/qemu/commit/8dbcd0e5e7cdef9ce0532f454a40e64bc2a1c283
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-20 (Thu, 20 Jul 2017)

  Changed paths:
    A .editorconfig
    A scripts/git.orderfile

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/misc-20170720-pull-request' 
into staging

git orderfile and editorconfig for 2.10

# gpg: Signature made Thu 20 Jul 2017 09:00:01 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/misc-20170720-pull-request:
  add editorconfig
  add scripts/git.orderfile

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/87a60ee84f8a...8dbcd0e5e7cd