summaryrefslogtreecommitdiff
path: root/scangobj-merge.py
Commit message (Expand)AuthorAgeFilesLines
* scanobj-merge: use the codec module for non ascii dataStefan Sauer2015-01-121-4/+5
* scangobj-merge: handle unicode exceptionStefan Sauer2015-01-121-0/+2
* plugin docs: make misc pythons scripts work with python3Tim-Philipp Müller2012-10-311-9/+11
* docs: further implement merging from doc-updatesStefan Kost2011-05-191-3/+33
* scanobj-merge: fix python deprecation warning and be silentStefan Kost2011-05-181-3/+2
* scangobj: move unlinking the .new files to mergeStefan Kost2011-04-041-0/+2
* spelling: fix spelling in comment and messageStefan Kost2011-03-241-1/+1
* Whitespace cleanupsFelipe Contreras2009-04-041-1/+1
* scangobj-merge.py: Don't depend on Twisted just for the OrderedDict but imple...Marc-Andre Lureau2008-05-061-6/+58
* merge additions from the .signals.new and .args.new file in the original ones...Thomas Vander Stichele2005-09-231-0/+226