projects / platform / upstream / atk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 64dd2a3 1bed4dd)
Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_16' into 'origin... 92/92592/1
authorMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 17 Oct 2016 12:25:31 +0000 (14:25 +0200)
committerMarcin Niesluchowski <m.niesluchow@samsung.com>
Mon, 17 Oct 2016 12:44:59 +0000 (14:44 +0200)
commit3448c1afc18efd81d3a0c9d1a4fd301068199137
tree281c26fd176a90ddc05e311a0c2e06be9aea75a4tree | snapshot
parent64dd2a3c3a8bffb86d836658afef68b4660c33ddcommit | diff
parent1bed4dd0d7eb38405278154d4351045e9e341bb1commit | diff
Merge remote-tracking branch 'origin/sandbox/mniesluchow/upstream_2_16' into 'origin/tizen'

Change introduces upstreamed 2.16 version with tizen specific patches from
origin/tizen on top. It also introduces two new patches for at-spi2-core
states compatibility and manifest installation.

Conflicts:
atk/atk.symbols

Change-Id: I3e729c7f147e57acea4a150c9e9d0a612fda26e5
Domain: UI Framework / Assistive Technology;