summaryrefslogtreecommitdiffstats
path: root/bin/tools
diff options
context:
space:
mode:
authorMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2013-09-20 12:38:48 +0200
committerMatthias Vogelgesang <matthias.vogelgesang@kit.edu>2013-09-20 12:38:48 +0200
commit1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37 (patch)
tree34bd46bb5d72e2b3c54a2ca6e01cc4a516fa9189 /bin/tools
parent57b722f74097da7709aec76afaa4ecb289e476d3 (diff)
parent081bbb4d5959c4999993fd2e2ce9298b9dfaa12c (diff)
downloaduca-1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37.tar.gz
uca-1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37.tar.bz2
uca-1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37.tar.xz
uca-1e0f5c0e7db5983ea4ceadc9ebb6992144eddc37.zip
Merge branch 'hiwi-changes' of https://github.com/MariaMatveeva/libuca into mm
Conflicts: bin/gui/control.glade
Diffstat (limited to 'bin/tools')
0 files changed, 0 insertions, 0 deletions