summaryrefslogtreecommitdiff
path: root/scangobj-merge.py
AgeCommit message (Expand)AuthorFilesLines
2015-01-12scanobj-merge: use the codec module for non ascii dataStefan Sauer1-4/+5
2015-01-12scangobj-merge: handle unicode exceptionStefan Sauer1-0/+2
2012-10-31plugin docs: make misc pythons scripts work with python3Tim-Philipp Müller1-9/+11
2011-05-19docs: further implement merging from doc-updatesStefan Kost1-3/+33
2011-05-18scanobj-merge: fix python deprecation warning and be silentStefan Kost1-3/+2
2011-04-04scangobj: move unlinking the .new files to mergeStefan Kost1-0/+2
2011-03-24spelling: fix spelling in comment and messageStefan Kost1-1/+1
2009-04-04Whitespace cleanupsFelipe Contreras1-1/+1
2008-05-06scangobj-merge.py: Don't depend on Twisted just for the OrderedDict but imple...Marc-Andre Lureau1-6/+58
2005-09-23merge additions from the .signals.new and .args.new file in the original ones...Thomas Vander Stichele1-0/+226