git.xonotic.org Git - xonotic/xonotic.git/commit

]> git.xonotic.org Git - xonotic/xonotic.git/commit

projects / xonotic / xonotic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: db64c0e 2caacb2)

author	Mario <zacjardine@y7mail.com>
	Fri, 14 Jul 2017 23:51:47 +0000 (23:51 +0000)
committer	Mario <zacjardine@y7mail.com>
	Fri, 14 Jul 2017 23:51:47 +0000 (23:51 +0000)
commit	243220bae3789792389d8985d4a52f101809f4f4
tree	fd21e6a1112dd7d9e26d825ab16061df941f3103	tree \| snapshot
parent	db64c0e16ea89bca0d55af5a26f17ecef0fe6316	commit \| diff
parent	2caacb2447fb3e78486ede063d3162a63606bc20	commit \| diff

Merge branch 'detrate/feature/encode-demos' into 'master'

Added command to convert video to gif to encode-demos.sh

See merge request !26

misc/tools/encode-demos.sh