uh, i guess this now merges the new delta stuff?
authorPerttu Ahola <celeron55@gmail.com>
Sat, 23 Jul 2011 12:50:05 +0000 (15:50 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Sat, 23 Jul 2011 12:50:05 +0000 (15:50 +0300)
1  2 
src/main.cpp

diff --cc src/main.cpp
Simple merge