Merge branch 'cpp'

Conflicts:
	hello-world
This commit is contained in:
lhark 2015-10-08 22:15:01 +02:00
commit abc28b191c

View file

@ -1,3 +1,3 @@
std::cout << "hello world"; std::cout << "hello world";
test testplopiplop