| commit | 96ae2d21f1070e43aec8e89287e6a72ec90e7795 | |
| author | Igor Trindade Oliveira <igor@Cygnus.(none)> | |
| Fri, 18 Sep 2009 18:52:40 +0000 (18 14:52 -0400) | ||
| committer | Igor Trindade Oliveira <igor@Cygnus.(none)> | |
| Fri, 18 Sep 2009 18:52:40 +0000 (18 14:52 -0400) | ||
| tree | 8fe97a37e80df56a7c8a9b64e77c9c68999a0cbb | treesnapshot (tar.gz zip) |
| parent | 815a63d65e1a09f1ebe228371d48130cb4f166b7 | commitdiff |
| parent | fc5ff3c50df597010365f2e6c6bf07f21f919d32 | commitdiff |
fix merge conflicts
| kineticview.cpp | diff1 | diff2 | blobhistory |
| kineticview.h | diff1 | diff2 | blobhistory |