]> mj.ucw.cz Git - osdd.git/commit
Merge branch 'xft' of ssh://git.ucw.cz/home/mj/GIT/osdd into xft
authorMartin Mares <mj@ucw.cz>
Wed, 23 Dec 2015 18:39:50 +0000 (19:39 +0100)
committerMartin Mares <mj@ucw.cz>
Wed, 23 Dec 2015 18:39:50 +0000 (19:39 +0100)
commitd4ad40d60a4538e4310541555c92c037fc26bff0
treeb7cb1de7af6eaa7f95ea57a24df822542a2c1cb9
parent01018e2c791bdd029f2f3de0ed12529aff4a2eda
parent824cef024dae8ce3aac85219a28d2538e6c716d6
Merge branch 'xft' of ssh://git.ucw.cz/home/mj/GIT/osdd into xft