projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ae6d1d eca85ce)
Merge branch 'master' into marin-t/contributing
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Feb 2018 12:15:02 +0000 (13:15 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Feb 2018 12:15:02 +0000 (13:15 +0100)
1  2 
README.md patch | diff1 | diff2 | blob | history

diff --cc README.md
Simple merge