aboutsummaryrefslogtreecommitdiff
path: root/.novaboot
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2015-08-13 11:54:31 +0200
committerKarel Kočí <cynerd@email.cz>2015-08-13 11:54:31 +0200
commit6193dece5f6fa1caf88612989bb908495d9ee6f7 (patch)
tree79400b7147cb7dc69fcd12195845660dd5cc95ae /.novaboot
parentfb3c8e339fb3896753f7130b8f8e34be8d89ae2e (diff)
parent5bf8e17c83d4b5500fd81edaee5c495161e1f0ba (diff)
downloadlinux-conf-perf-6193dece5f6fa1caf88612989bb908495d9ee6f7.tar.gz
linux-conf-perf-6193dece5f6fa1caf88612989bb908495d9ee6f7.tar.bz2
linux-conf-perf-6193dece5f6fa1caf88612989bb908495d9ee6f7.zip
Merge branch 'master' into measuring
Conflicts: conf.py scripts/configurations.py
Diffstat (limited to '.novaboot')
0 files changed, 0 insertions, 0 deletions