missvaleska@missvaleska-GA-970A-D3:~/Documents/Netsukuku/NtkDoc/html$ git status# On branch gh-pages
missvaleska@missvaleska-GA-970A-D3:~/Documents/Netsukuku/NtkDoc/html$ git status# On branch gh-pages
Doxygen generated Documentation
Merge branch 'gh-pages' of https://github.com/Netsukuku/netsukuku into gh-pages

Conflicts:
	index.html

More doxgyen stuff I guess