From dbc51f48c62281fa1424e36628b5fb42e5ac52aa Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Mon, 26 Sep 2016 12:53:03 +0200 Subject: [PATCH 1/7] first develop coomit --- helloworld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helloworld.cpp b/helloworld.cpp index 3d98240..6775fe7 100644 --- a/helloworld.cpp +++ b/helloworld.cpp @@ -3,6 +3,6 @@ using namespace std; int main(int argc, char** argv) { - cout<<"Hello World!"; + cout<<"Hello World from develop!"; return 0; } From 41d7ea16e10c278c78279125f764cab84ef40592 Mon Sep 17 00:00:00 2001 From: polmr Date: Mon, 26 Sep 2016 18:33:30 +0200 Subject: [PATCH 2/7] said again --- helloworld.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/helloworld.cpp b/helloworld.cpp index 6775fe7..ae91b65 100644 --- a/helloworld.cpp +++ b/helloworld.cpp @@ -4,5 +4,6 @@ using namespace std; int main(int argc, char** argv) { cout<<"Hello World from develop!"; + cout<<"Said again!"; return 0; } From 81cfc530c800954f8b5580beda79c3b3eabb81bb Mon Sep 17 00:00:00 2001 From: polmr Date: Mon, 26 Sep 2016 18:36:28 +0200 Subject: [PATCH 3/7] salutes --- helloworld.cpp | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/helloworld.cpp b/helloworld.cpp index ae91b65..f07a872 100644 --- a/helloworld.cpp +++ b/helloworld.cpp @@ -1,9 +1,23 @@ #include using namespace std; + +void salute01() +{ + cout <<"salute 01!" << endl; +} + +void yujuu02() +{ + cout <<"salute 02!" << endl; +} int main(int argc, char** argv) { - cout<<"Hello World from develop!"; - cout<<"Said again!"; + cout<<"Hello World from develop! br06" << endl; + cout<<"Said again!" << endl; + + salute01(); + yujuu02(); + return 0; } From 0c0321d0308f7346273050c443ab9f17355d06c9 Mon Sep 17 00:00:00 2001 From: polmr Date: Mon, 26 Sep 2016 18:39:37 +0200 Subject: [PATCH 4/7] tocadodevelop --- helloworld.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helloworld.cpp b/helloworld.cpp index f07a872..ffa29bb 100644 --- a/helloworld.cpp +++ b/helloworld.cpp @@ -4,12 +4,12 @@ using namespace std; void salute01() { - cout <<"salute 01!" << endl; + cout <<"salute 01 tocado por develop!" << endl; } void yujuu02() { - cout <<"salute 02!" << endl; + cout <<"salute 02 tocado por branch!" << endl; } int main(int argc, char** argv) { From 34bf465d501639e9d02766559ca23ef56bf1f34b Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Fri, 22 Jun 2018 13:09:48 +0200 Subject: [PATCH 5/7] 02 --- helloworld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helloworld.cpp b/helloworld.cpp index ffa29bb..88ff5d3 100644 --- a/helloworld.cpp +++ b/helloworld.cpp @@ -4,7 +4,7 @@ using namespace std; void salute01() { - cout <<"salute 01 tocado por develop!" << endl; + cout <<"salute 01 tocado por develop, again!" << endl; } void yujuu02() From 15215762d0ab4488c61202e7856ca68cc0184054 Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Fri, 22 Jun 2018 13:11:15 +0200 Subject: [PATCH 6/7] 02b --- helloworld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helloworld.cpp b/helloworld.cpp index 88ff5d3..40bdb67 100644 --- a/helloworld.cpp +++ b/helloworld.cpp @@ -4,7 +4,7 @@ using namespace std; void salute01() { - cout <<"salute 01 tocado por develop, again!" << endl; + cout <<"salute 01 tocado por develop, again 02!" << endl; } void yujuu02() From b8f6f1e8fa76dae55fa7c21a5ef500a5f4c4c0cf Mon Sep 17 00:00:00 2001 From: Pablo Martin Date: Fri, 22 Jun 2018 13:13:01 +0200 Subject: [PATCH 7/7] 03 --- helloworld.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helloworld.cpp b/helloworld.cpp index 40bdb67..50087ad 100644 --- a/helloworld.cpp +++ b/helloworld.cpp @@ -4,7 +4,7 @@ using namespace std; void salute01() { - cout <<"salute 01 tocado por develop, again 02!" << endl; + cout <<"salute 01 tocado por develop, again 03!" << endl; } void yujuu02()