ericsenn/tg_git
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

merge into: ericsenn:master
Branches Tags
ericsenn:master
ericsenn:develop
...
pull from: ericsenn:develop
Branches Tags
ericsenn:develop
ericsenn:master

9 commits
master ... develop

Author SHA1 Message Date
ericsenn 4fa9078841 conflict resolved 2021-10-26 08:19:04 +02:00
ericsenn b325fbb131 one more feature from myname 2021-10-26 08:11:30 +02:00
ericsenn bac225c45f one more feature from eric 2021-10-26 08:07:31 +02:00
ericsenn b79ac163e8 myname feature addition 2021-10-26 07:55:02 +02:00
ericsenn bbff94a958 conflict treatment 2021-09-20 15:36:44 +02:00
ericsenn 37cfaf65f7 senn feature modification 2021-09-20 15:16:56 +02:00
ericsenn 5c77fdd24a guy feat test 2021-09-20 15:03:43 +02:00
ericsenn 920bdf70a2 else guy commit 2021-09-20 14:53:42 +02:00
ericsenn 23033837be Eric SENN second feature 2021-09-20 13:18:55 +02:00
2 changed files with 5 additions and 0 deletions
Show stats Expand all files Collapse all files

BIN
bin/Debug/hello_all
View file

Binary file not shown.

5
src/hello_all.cpp
View file

@ -7,5 +7,10 @@ using namespace std;
int main(int argc,char **argv) {
cout << "Eric SENN has added his feature" << endl;
cout << "Eric SENN has added another feature modified" << endl;
cout << "Else GUY has added another feature there" << endl;
cout << "myname has added another feature" << endl;
cout << "myname has added one more feature here" << endl;
cout << "Eric SENN has added one more feature here" << endl;
return 0;
}