]> git.sesse.net Git - nageru/commit - nageru/mixer.cpp
projects / nageru / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 392f9d1 6e116a6)
Merge remote-tracking branch 'futatabi/master'
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 1 Dec 2018 23:11:12 +0000 (00:11 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 1 Dec 2018 23:11:12 +0000 (00:11 +0100)
commit9b7d691b4cc5db7dbfc18c82e86c1207fcac4722
tree529bdb5142829e4172af3208121beb570b98738btree | snapshot
parent392f9d1ccb835c05a3874c4bea163788b2c37024commit | diff
parent6e116a6bbeb2c047a3bfb084395ec601ce211e6ccommit | diff
Merge remote-tracking branch 'futatabi/master'

This merges Nageru and Futatabi, since they are fairly closely related
and also share a fair amount of code.
.gitignore diff1 | diff2 | blob | history
futatabi/meson.build | diff2 | blob | history
meson.build diff1 | diff2 | blob | history
nageru/meson.build diff1 | | blob | history
Unnamed repository; edit this file 'description' to name the repository.