]> git.zarvox.org Git - shareboard.git/commitdiff
projects / shareboard.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b9bf3ce c01d5f5)
Merge branch 'master' of http://zarvox.org/~zarvox/shareboard
authorluke.segars <lukes@eecs.berkeley.edu>
Fri, 8 Oct 2010 07:32:33 +0000 (00:32 -0700)
committerluke.segars <lukes@eecs.berkeley.edu>
Fri, 8 Oct 2010 07:32:33 +0000 (00:32 -0700)
1  2 
mainwindow.cpp patch | diff1 | diff2 | blob | history

diff --cc mainwindow.cpp
Simple merge
Shared internet whiteboard tool