Merge branch 'video' of git.linphone.org:linphone-android-private into video
This commit is contained in:
commit
6201f44ebe
3 changed files with 2 additions and 4 deletions
|
@ -255,7 +255,5 @@ public class LinphoneActivity extends TabActivity implements SensorEventListener
|
|||
}
|
||||
getWindow().setAttributes(lAttrs);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
2
submodules/externals/libswscale
vendored
2
submodules/externals/libswscale
vendored
|
@ -1 +1 @@
|
|||
Subproject commit fae6720e516a0c1448a22b4a5cbc67e6819c965e
|
||||
Subproject commit e75b939d479ce8120d2d30d7275849e3377a990e
|
|
@ -1 +1 @@
|
|||
Subproject commit 5cdf291009aa0481259b99ff15c62d0c178d5e36
|
||||
Subproject commit cdba824dc5673de0250f46b909c4bcde1b3388ad
|
Loading…
Reference in a new issue