Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

platform_packages_services_VncFlinger
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

859fecaf

Commit 859fecaf authored 2 years ago by Nick

Downloads
- Plain Diff

Merge branch 'android-12.0' of github.com:omnirom/android_external_vncflinger

Conflicts:
	src/AndroidDesktop.cpp
	src/AndroidPixelBuffer.cpp
	src/AndroidPixelBuffer.h

parents b2f13227 80ee9660

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/AndroidDesktop.cpp 12 additions, 7 deletions

src/AndroidDesktop.cpp
src/AndroidDesktop.h 4 additions, 2 deletions

src/AndroidDesktop.h
src/AndroidPixelBuffer.cpp 6 additions, 8 deletions

src/AndroidPixelBuffer.cpp
src/AndroidPixelBuffer.h 4 additions, 3 deletions

src/AndroidPixelBuffer.h
src/VirtualDisplay.cpp 7 additions, 6 deletions

src/VirtualDisplay.cpp
src/VirtualDisplay.h 4 additions, 2 deletions

src/VirtualDisplay.h

with 37 additions and 28 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