diff options
| author | Nathan Straz <nstraz@redhat.com> | 2010-09-30 14:49:18 -0400 |
|---|---|---|
| committer | Nathan Straz <nstraz@redhat.com> | 2010-09-30 14:49:18 -0400 |
| commit | 882ff23885f33c7f4eb097e31f49aefd6b5f8930 (patch) | |
| tree | 50781e99b8951452e51c762654c884fb3532517f /Makefile | |
| parent | 314cc45e160cb0a2d6ccb51f95e40c42bed84c4e (diff) | |
| parent | edf6032e3395baa5e2a160e4f70d3b108ae31622 (diff) | |
| download | qarsh-882ff23885f33c7f4eb097e31f49aefd6b5f8930.tar.gz qarsh-882ff23885f33c7f4eb097e31f49aefd6b5f8930.tar.xz qarsh-882ff23885f33c7f4eb097e31f49aefd6b5f8930.zip | |
Merge branch 'ipv6' of ssh://sts-a//home/msp/djansa/src/git/qarsh into ipv6
Conflicts:
qarsh.c
sockutil.c
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions