Now the conflict severity is drawn.
authorPhilipp Spitzer <philipp@spitzer.priv.at>
Fri, 20 Jan 2017 22:04:17 +0000 (23:04 +0100)
committerPhilipp Spitzer <philipp@spitzer.priv.at>
Fri, 20 Jan 2017 22:04:17 +0000 (23:04 +0100)
commit1343ea42bdec8f70936ea4e41586993260e2d265
tree7bdf7aff6313628fb5d6bfbe4e73dc8f2f07bc2c
parentec7fa224122933cbb338b017c37a3338b50d6f73
Now the conflict severity is drawn.
src/mvc/delegate.cpp
src/mvc/event.cpp
src/mvc/event.h