]> rtime.felk.cvut.cz Git - omk/sssa.git/commit
Merge branch 'master' into sssa
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 5 May 2009 13:29:56 +0000 (15:29 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 5 May 2009 13:29:56 +0000 (15:29 +0200)
commitf28236eea25fdde1a2a9c764df87209a3f69d133
treefba2844293f5e6c2b214d25dffc70c0a983d04f6
parent628bd48e3f017f7f0e67da76d89463ba3297d9f6
parente8faa8742a3edf79106dbd5a889b1e34c9250572
Merge branch 'master' into sssa

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