Merge branch 'upstream' into tizen 25/133325/1
authorRafal Krypa <r.krypa@samsung.com>
Fri, 9 Jun 2017 19:31:02 +0000 (21:31 +0200)
committerRafal Krypa <r.krypa@samsung.com>
Fri, 9 Jun 2017 19:31:02 +0000 (21:31 +0200)
commit01709c10d6c2d64b91691ec5218379b29e930c9f
tree86fac5d7ead87ba6773a9c1a3a90a3f271d705c4
parent3268b0a5872a2a28cf1afd5ff3ff9b5e382729a4
parentba32c8624c2a69a7a6b747c09d5c9b79324382b7
Merge branch 'upstream' into tizen

Change-Id: I823593e18fb8e8eb9f6cd04cb5518a13563cd521
Makefile.am
gl/Makefile.am
packaging/gnutls.spec
src/benchmark-cipher.c