Skip to content
Snippets Groups Projects
Commit 44931c09 authored by Eike Ziller's avatar Eike Ziller
Browse files

Merge remote-tracking branch 'origin/2.7' 

Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
parents ea75b0d1 1526011f
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1740 additions and 5196 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment