UCDP and PRIO - sequence
The UCDP and PRIO annually publish the Armed Conflict Dataset and the Battle-Related Deaths Dataset. These have been combined to localise wars and conflict. The underlying definition of war only recognises wars or conflicts in which at least one state is involved and which results in at least 25 battle-related deaths. They classify wars into extra state / extra systemic violent conflicts (state against non-state actor outside of existing borders), inter-state conflict (between two states) and intra-state (state against non-state actor within existing borders) and internationalised intra-state conflicts (state aided by other states against non-state actor within existing borders).
Links:
UCDP (Uppsala Conflict Data Program)
PRIO (Peace Research Institute Oslo)