projects / platform / upstream / gnutls.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3268b0a ba32c86)
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)
Change-Id: I823593e18fb8e8eb9f6cd04cb5518a13563cd521

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
gl/Makefile.am patch | diff1 | diff2 | blob | history
packaging/gnutls.spec patch | diff1 | | blob | history
src/benchmark-cipher.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
index f1374e2,a20f79f..6221422
mode 100755,100644..100755
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
diff --cc gl/Makefile.am
index d1f351f,0851edc..4a09bd9
mode 100755,100644..100755
--- 1/gl/Makefile.am
--- 2/gl/Makefile.am
+++ b/gl/Makefile.am
diff --cc packaging/gnutls.spec
index 5ef115b,0000000..5ef115b
mode 100755,000000..100644
--- 1/packaging/gnutls.spec
--- /dev/null
+++ b/packaging/gnutls.spec
diff --cc src/benchmark-cipher.c
Simple merge
Domain: Security / Utilities;