projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8497281
a3e251b
)
Merge branch 'master' into divVerent/crypto2
author
Rudolf Polzer <divVerent@alientrap.org>
Fri, 24 Sep 2010 10:50:35 +0000
(12:50 +0200)
committer
Rudolf Polzer <divVerent@alientrap.org>
Fri, 24 Sep 2010 10:50:35 +0000
(12:50 +0200)
Conflicts:
misc/builddeps/dp.win64/include/d3dtypes.h
misc/builddeps/dp.win64/include/dsound.h
1
2
all
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
all
Simple merge