]> rtime.felk.cvut.cz Git - frescor/frsh.git/commit
Merge branch 'master' of git://rtime.felk.cvut.cz/frescor/frsh_forb
authorMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 19 May 2009 13:38:41 +0000 (15:38 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Tue, 19 May 2009 13:38:41 +0000 (15:38 +0200)
commit23ee8fbc0b0569f2a7a90ea4fccad1fa6024aaa1
tree93064ed9788933173d0a637676e98a71cf5a798c
parentb9901ee8bc0ce034d7b5d24eeecb987f20fcc1ca
parentb2c9e33bc9e413fda15d969ca57b228ffa2b257c
Merge branch 'master' of git://rtime.felk.cvut.cz/frescor/frsh_forb

Conflicts:
frsh_api/frsh_power.c
fres/cbroker/fcb.c
frsh_api/frsh_power.c