Homec4science
Diffusion liboncilla 32fa0787f6aa

Merge branch 'master' of ponyo.epfl.ch:oncilla/liboncilla
32fa0787f6aa
Actions

Authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> on Apr 12 2012, 17:10.

Description

Merge branch 'master' of ponyo.epfl.ch:oncilla/liboncilla

Conflicts:
.gitignore

Details

Committed
Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>Apr 12 2012, 17:10
Pushed
tuleuMay 7 2018, 15:22
Parents
R6622:4fce30941059: Merge branch 'master' of ponyo.epfl.ch:oncilla/liboncilla
R6622:b6739edb9ec2: Switched to tr1/memormry for shared_ptr
Branches
Unknown
Tags
Unknown

Event Timeline

Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org> committed R6622:32fa0787f6aa: Merge branch 'master' of ponyo.epfl.ch:oncilla/liboncilla (authored by Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>).Apr 12 2012, 17:10

Merged Changes

CommitAuthorDetailsCommitted
4fce30941059Alexandre Tuleu
Merge branch 'master' of ponyo.epfl.ch:oncilla/liboncilla 
Dec 13 2011
c5a27a59d4d0Alexandre Tuleu
Added base files 
Aug 27 2011

Empty Commit

This commit is empty and does not affect any paths.
c4science · Help