]> rtime.felk.cvut.cz Git - omk/sssa.git/commitdiff
projects / omk / sssa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db8cf3b ded88db)
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)
Conflicts:
snippets/linux.omk


Trivial merge
OMK adaptation for AQuoSA