From 8aee306300adb099b66036f2c2f7f3996433cf49 Mon Sep 17 00:00:00 2001 From: praveeng Date: Tue, 5 Jul 2016 15:00:31 +0530 Subject: [PATCH 01/14] small modification to readme for git push test Change-Id: I68506a49586b07eaa907f3f85304ee40d4c92d0a --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83920d5fd..fe2ea890b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -Introduction +Introduction.. ------------ BLIS is a portable software framework for instantiating high-performance From 357c990bdd7bd5667aac5adf1bab3712973e7414 Mon Sep 17 00:00:00 2001 From: praveeng Date: Tue, 5 Jul 2016 16:51:23 +0530 Subject: [PATCH 02/14] first commit Change-Id: Ib50c81acda3b2c1583da3d421efc0ca547ef68e2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe2ea890b..a32ae5c71 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -Introduction.. +Introduction.... ------------ BLIS is a portable software framework for instantiating high-performance From 41fb32711031e7ec86b062aa7f53255d1f5905e2 Mon Sep 17 00:00:00 2001 From: praveeng Date: Tue, 5 Jul 2016 15:00:31 +0530 Subject: [PATCH 03/14] small modification to readme for git push test Change-Id: I68506a49586b07eaa907f3f85304ee40d4c92d0a --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7142a1329..302c9a827 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -Introduction +Introduction.. ------------ BLIS is a portable software framework for instantiating high-performance From 197e182fcbf1340fd4a202fac58bea6cfcfa9e2f Mon Sep 17 00:00:00 2001 From: praveeng Date: Tue, 5 Jul 2016 16:51:23 +0530 Subject: [PATCH 04/14] first commit Change-Id: Ib50c81acda3b2c1583da3d421efc0ca547ef68e2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 302c9a827..18c9f84a4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -Introduction.. +Introduction.... ------------ BLIS is a portable software framework for instantiating high-performance From f493bf4d704fe0e967783cd6e6877d3302c056a1 Mon Sep 17 00:00:00 2001 From: praveeng Date: Mon, 25 Jul 2016 14:14:00 +0530 Subject: [PATCH 05/14] removed changes from readme file which are giving confilcts Change-Id: Ic71ad1313e1404fed444e899466043704d875af6 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18c9f84a4..7142a1329 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -Introduction.... +Introduction ------------ BLIS is a portable software framework for instantiating high-performance From 5ebeece5b4a8df81d59ca7558b278a4263d15128 Mon Sep 17 00:00:00 2001 From: praveeng Date: Thu, 28 Jul 2016 15:01:36 +0530 Subject: [PATCH 06/14] Revert commits 8aee306 Change-Id: I3dd999c77c6779332a40dbb84371ca487216f189 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7142a1329..5f428b784 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,11 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) +<<<<<<< HEAD Introduction +======= +Introduction.. +>>>>>>> parent of 357c990... first commit ------------ BLIS is a portable software framework for instantiating high-performance From b0d510bf0e4dfd177f9e4ae0069f41921e2ecdc1 Mon Sep 17 00:00:00 2001 From: praveeng Date: Thu, 28 Jul 2016 15:11:08 +0530 Subject: [PATCH 07/14] Revert commits 357c990bdd7bd5667aac5adf1bab3712973e7414 Change-Id: I12a34456d7eed93fda4369e76bcddb42ba7ccb99 --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 5f428b784..b1f7726ef 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,8 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -<<<<<<< HEAD + Introduction -======= -Introduction.. ->>>>>>> parent of 357c990... first commit ------------ BLIS is a portable software framework for instantiating high-performance From 922e3091702f25e3287b417719a33adbd5bbf138 Mon Sep 17 00:00:00 2001 From: praveeng Date: Tue, 5 Jul 2016 15:00:31 +0530 Subject: [PATCH 08/14] small modification to readme for git push test Change-Id: I68506a49586b07eaa907f3f85304ee40d4c92d0a --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7142a1329..302c9a827 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -Introduction +Introduction.. ------------ BLIS is a portable software framework for instantiating high-performance From 23cca231be10fe1797aed451bcbc69d38c78bc0c Mon Sep 17 00:00:00 2001 From: praveeng Date: Tue, 5 Jul 2016 16:51:23 +0530 Subject: [PATCH 09/14] first commit Change-Id: Ib50c81acda3b2c1583da3d421efc0ca547ef68e2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 302c9a827..18c9f84a4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -Introduction.. +Introduction.... ------------ BLIS is a portable software framework for instantiating high-performance From 65905c3011a11cda95761681d4ae84337e46bdb5 Mon Sep 17 00:00:00 2001 From: praveeng Date: Tue, 5 Jul 2016 15:00:31 +0530 Subject: [PATCH 10/14] small modification to readme for git push test Change-Id: I68506a49586b07eaa907f3f85304ee40d4c92d0a --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 18c9f84a4..b1f7726ef 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -Introduction.... + +Introduction ------------ BLIS is a portable software framework for instantiating high-performance From d81273047bff56501e9413a90991d3d1f8b56a06 Mon Sep 17 00:00:00 2001 From: praveeng Date: Tue, 5 Jul 2016 16:51:23 +0530 Subject: [PATCH 11/14] first commit Change-Id: Ib50c81acda3b2c1583da3d421efc0ca547ef68e2 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b1f7726ef..cefef31ce 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) + Introduction ------------ From 1b5d104afe0628b8b6c0650f1e58cfb08be67004 Mon Sep 17 00:00:00 2001 From: praveeng Date: Mon, 25 Jul 2016 14:14:00 +0530 Subject: [PATCH 12/14] removed changes from readme file which are giving confilcts Change-Id: Ic71ad1313e1404fed444e899466043704d875af6 --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index cefef31ce..7142a1329 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) - - Introduction ------------ From 2fcdc28f1055d385b2e662aa920fb97c472394d7 Mon Sep 17 00:00:00 2001 From: praveeng Date: Thu, 28 Jul 2016 15:01:36 +0530 Subject: [PATCH 13/14] Revert commits 8aee306 Change-Id: I3dd999c77c6779332a40dbb84371ca487216f189 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7142a1329..5f428b784 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,11 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) +<<<<<<< HEAD Introduction +======= +Introduction.. +>>>>>>> parent of 357c990... first commit ------------ BLIS is a portable software framework for instantiating high-performance From 117f8838511a478aa16137e770d27dd21f4227c5 Mon Sep 17 00:00:00 2001 From: praveeng Date: Thu, 28 Jul 2016 15:11:08 +0530 Subject: [PATCH 14/14] Revert commits 357c990bdd7bd5667aac5adf1bab3712973e7414 Change-Id: I12a34456d7eed93fda4369e76bcddb42ba7ccb99 --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 5f428b784..b1f7726ef 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,8 @@ [![Build Status](https://travis-ci.org/flame/blis.svg?branch=master)](https://travis-ci.org/flame/blis) -<<<<<<< HEAD + Introduction -======= -Introduction.. ->>>>>>> parent of 357c990... first commit ------------ BLIS is a portable software framework for instantiating high-performance