diff options
| author |  Jonathan Beck | 2009-03-24 20:58:43 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-03-24 20:58:43 +0100 |
| commit | 85b8a301be39c4b86cb7f38e80c3cb592240ccb9 (patch) | |
| tree | 4974fc254afbf0226e610fd962b5dc74c094cf9f /src/NotificationProxy.h | |
| parent | 19992c668afeb53a28e08a1f61572b5379f87590 (diff) | |
| parent | 0114d8da493e69f14bc2669ae0ec6b9813b237cf (diff) | |
| download | libimobiledevice-85b8a301be39c4b86cb7f38e80c3cb592240ccb9.tar.gz libimobiledevice-85b8a301be39c4b86cb7f38e80c3cb592240ccb9.tar.bz2 | |
Merge branch 'master' of git://github.com/MattColyer/libiphone into contact_sync
Conflicts:
Makefile.am
configure.ac
src/AFC.h
src/NotificationProxy.c
src/lockdown.c
Diffstat (limited to 'src/NotificationProxy.h')
| -rw-r--r-- | src/NotificationProxy.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/NotificationProxy.h b/src/NotificationProxy.h index 57ad751..7b4b48d 100644 --- a/src/NotificationProxy.h +++ b/src/NotificationProxy.h @@ -28,4 +28,3 @@ struct iphone_np_client_int { iphone_umux_client_t connection; GMutex *mutex; }; - |