]> rtime.felk.cvut.cz Git - omk/sssa.git/commit
Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/omk
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 21 May 2009 11:12:56 +0000 (13:12 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 21 May 2009 11:12:56 +0000 (13:12 +0200)
commit11801ce9c4dbdc147500eec1a07de689f725c20d
tree6c0c3d282a27f5ff9954e0187fbc5b3c83e5a77f
parentdb8cf3b9a0335a0a5e7381fc8642c4e2531674a4
parentded88db20aedb17a068317630f8ae5f9d9b011ae
Merge branch 'master' of sojka@rtime.felk.cvut.cz:/var/git/omk

Conflicts:
snippets/linux.omk