diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 17:48:02 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 17:48:02 -0300 |
| commit | 3ed397b79d2640d4e59608ed4659a2d6f344cddf (patch) | |
| tree | 331402d5c419339b69657fea7fad68a48d7d52c6 /.gitignore | |
| parent | Merge commit '1215c6e7615897e4a0bfd6867b762a47fc34f37f' into upstream-merge (diff) | |
| parent | Rename config.{h, mak} config-target.{h, mak} (diff) | |
| download | qemu-kvm-3ed397b79d2640d4e59608ed4659a2d6f344cddf.tar.gz qemu-kvm-3ed397b79d2640d4e59608ed4659a2d6f344cddf.tar.bz2 qemu-kvm-3ed397b79d2640d4e59608ed4659a2d6f344cddf.zip | |
Merge commit '25be210f69543faae4f22bfa2c7446c4f1be62ef' into upstream-merge
* commit '25be210f69543faae4f22bfa2c7446c4f1be62ef':
Rename config.{h, mak} config-target.{h, mak}
Remove useless check for config-host.mak
Conflicts:
configure
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f6cbffb57..15a1eab0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ config-host.* +config-target.* i386 *-softmmu *-darwin-user |