Skip to content
GitLab
Explore
Sign in
Register
savoirfairelinux
jami-daemon
Repository
jami-daemon
src
memmanager
MemManager.h
Find file
Blame
History
Permalink
Merge branch 'video' of
git://sflphone.org/git/sflphone
into video
· fff7960c
sfl
authored
Mar 03, 2008
Conflicts: src/memmanager/MemManager.h
fff7960c