Merge branch 'deletelocal' into blead
authorVincent Pit <perl@profvince.com>
Wed, 29 Jul 2009 18:38:07 +0000 (20:38 +0200)
committerVincent Pit <perl@profvince.com>
Wed, 29 Jul 2009 18:38:07 +0000 (20:38 +0200)
1  2 
embed.fnc
embed.h
proto.h

diff --cc embed.fnc
Simple merge
diff --cc embed.h
Simple merge
diff --cc proto.h
Simple merge