| commit | dbba0042c7515f96a0bc29958f5994fded2b7cab | |
| author | Adenilson Cavalcanti <adenilson@macblack.(none)> | |
| Fri, 14 Aug 2009 14:47:22 +0000 (14 10:47 -0400) | ||
| committer | Adenilson Cavalcanti <adenilson@macblack.(none)> | |
| Fri, 14 Aug 2009 14:47:22 +0000 (14 10:47 -0400) | ||
| tree | 313f9ad5902530680d2943d3031f186aed72db62 | treesnapshot (tar.gz zip) |
| parent | e59f56e5dc39edc1e724fea20eb7e6f71654cb54 | commitdiff |
| parent | 7a329663c56112698f292d33ff87190957a3ecce | commitdiff |
Solving merge conflicts.
| CMakeLists.txt | diff1 | diff2 | blobhistory |
| contactframe.cpp | blob | ||
| contactframe.h | blob |