]> Shamusworld >> Repos - virtualjaguar/commitdiff
projects / virtualjaguar / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 70a54a6 8103796)
Merge branch 'master' of http://shamusworld.gotdns.org/git/virtualjaguar
authorShamus Hammons <jlhamm@acm.org>
Mon, 3 Dec 2012 04:35:15 +0000 (22:35 -0600)
committerShamus Hammons <jlhamm@acm.org>
Mon, 3 Dec 2012 04:35:15 +0000 (22:35 -0600)
Sometimes things get out of sync... :-P

1  2 
src/gui/mainwin.cpp patch | diff1 | diff2 | blob | history

diff --cc src/gui/mainwin.cpp
Simple merge
Unnamed repository; edit this file 'description' to name the repository.