| commit | 6b0569c1ce25e6b37eb87648972ea404ba743f11 | |
| author | Lee Hicks <blacklocist@gmail.com> | |
| Wed, 6 May 2009 21:21:20 +0000 (6 16:21 -0500) | ||
| committer | Lee Hicks <blacklocist@gmail.com> | |
| Wed, 6 May 2009 21:21:20 +0000 (6 16:21 -0500) | ||
| tree | 5a1a7e181de2f128df2d60a77a16f98405951601 | treesnapshot (tar.gz zip) |
| parent | c105292ab38dbb4f0132d7b75da7422a72351209 | commitdiff |
| parent | 2f0fe4b38693f27f44b1a30fd57df19b6f3fcd9d | commitdiff |
Merge branch 'master' of git://repo.or.cz/EconoBoard
Conflicts:
src/application.cpp
src/camerathread.cpp
src/camerathread.h
src/setupdialog.cpp
src/setupdialog.h
Conflicts:
src/application.cpp
src/camerathread.cpp
src/camerathread.h
src/setupdialog.cpp
src/setupdialog.h
| src/camerathread.cpp | diff1 | diff2 | blobhistory |
| src/camerathread.h | diff1 | diff2 | blobhistory |
| src/setupdialog.cpp | diff1 | diff2 | blobhistory |
| src/setupdialog.h | diff1 | diff2 | blobhistory |