projects / platform / upstream / atk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Domain: UI Framework / Assistive Technology;