Warfare Totals, Interstate Warfare, and Societal Warfare from 1946 to 2011.
http://www.systemicpeace.org/conflicttrends.html