Skip to content
GitLab
Select Git revision
  • 6.2.2
  • 6.2
  • dev default
  • 6.2.1
  • 6.2.0
  • 5.12
  • 5.12.12
  • 6.1
  • 6.1.3
  • 6.1.2
  • 6.1.1
  • 6.1.0
  • 5.12.11
  • 5.15
  • 5.15.2
  • 5.12.10
  • 5.15.1
  • 5.12.9
  • 5.15.0
  • 5.14
  • v5.15.0-alpha1
  • v5.12.7
  • v5.14.1
  • v5.9.9
  • v5.14.0
  • v5.14.0-rc2
  • v5.14.0-rc1
  • v5.12.6
  • v5.14.0-beta3
  • v5.13.2
  • v5.14.0-beta2
  • v5.14.0-beta1
  • v5.14.0-alpha1
  • v5.12.5
  • v5.13.1
  • v5.13.0
  • v5.13.0-rc3
  • v5.12.4
  • v5.13.0-rc2
  • v5.13.0-rc1
Find file BlameHistoryPermalink
  • Liang Qi's avatar
    Merge remote-tracking branch 'origin/5.6' into 5.7 · 17548a0b
    Liang Qi authored 
    Conflicts:
	src/virtualkeyboard/lipisharedrecognizer.cpp
	src/virtualkeyboard/styles/styles.pro
	src/virtualkeyboard/virtualkeyboard.pro

Change-Id: I150f2ad265f8a7bd07be1d9415cdad854e200e87
    17548a0b