Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AndroidSystemCore
- Activity
- Members

Snippets Groups Projects

77d0c65b

Commit 77d0c65b authored Dec 19, 2008 by Jean-Baptiste Queru

Downloads
- Plain Diff

Merge commit 'remotes/korg/cupcake'

Conflicts:
	init/devices.c
	logwrapper/logwrapper.c
	mountd/AutoMount.c

parents 829dd45f 35237d13

Branches

Tags

No related merge requests found

Changes 79

Show whitespace changes

Inline Side-by-side

Showing

Android.mk 2 additions, 1 deletion

Android.mk
adb/Android.mk 40 additions, 8 deletions

adb/Android.mk
adb/OVERVIEW.TXT 139 additions, 0 deletions

adb/OVERVIEW.TXT
adb/SERVICES.TXT 245 additions, 0 deletions

adb/SERVICES.TXT
adb/adb.c 54 additions, 54 deletions

adb/adb.c
adb/adb.h 14 additions, 9 deletions

adb/adb.h
adb/adb_client.c 13 additions, 13 deletions

adb/adb_client.c
adb/commandline.c 34 additions, 22 deletions

adb/commandline.c
adb/file_sync_client.c 13 additions, 13 deletions

adb/file_sync_client.c
adb/file_sync_service.c 3 additions, 3 deletions

adb/file_sync_service.c
adb/framebuffer_service.c 5 additions, 4 deletions

adb/framebuffer_service.c
adb/get_my_path_windows.c 6 additions, 6 deletions

adb/get_my_path_windows.c
adb/jdwp_service.c 2 additions, 2 deletions

adb/jdwp_service.c
adb/sockets.c 108 additions, 54 deletions

adb/sockets.c
adb/sysdeps_win32.c 58 additions, 58 deletions

adb/sysdeps_win32.c
adb/transport_local.c 8 additions, 7 deletions

adb/transport_local.c
adb/transport_usb.c 6 additions, 6 deletions

adb/transport_usb.c
adb/usb_linux_client.c 1 addition, 1 deletion

adb/usb_linux_client.c
adb/usb_osx.c 11 additions, 11 deletions

adb/usb_osx.c
adb/usb_windows.c 9 additions, 9 deletions

adb/usb_windows.c

with 771 additions and 281 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment