]> rtime.felk.cvut.cz Git - omk/sssa.git/commit
Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/omk into sssa master
authorMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 31 May 2009 14:11:24 +0000 (16:11 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Sun, 31 May 2009 14:11:24 +0000 (16:11 +0200)
commitcefce4c965d84303117f8d0f636aa5cf6138e058
tree8f6c61f19839af83120d6e64535e4fed1354322d
parent693238be6e4d66a3d6774025a42d09eb378bee3f
parent20d0e1677eeec780ab9154073d42208565875470
Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/omk into sssa

Conflicts:
snippets/linux.omk
snippets/linux.omk