Merge branch 'devtools' (early part) - devtools32

diff options

author	Luke Shumaker <LukeShu@sbcglobal.net>	2013-09-26 16:23:32 -0400
committer	Luke Shumaker <LukeShu@sbcglobal.net>	2013-09-26 16:23:32 -0400
commit	67bcecbbe42c727936d825363fbd1e2173bab574 (patch)
tree	4443427102b172f3963f98a6e32c76e7b1da4b1a /pacman-extra.conf
parent	46e8d5b656945179d7dc79c6d5c93034f1495367 (diff)
parent	9c85d116f0425817b4a631e7a693dc5c948e2470 (diff)

Merge branch 'devtools' (early part)

Conflicts: arch-nspawn.in This effectively reverts my machine_name patch; I took a simpler route to dealing with a working_dir with funny characters in it, using a different scheme for the machine_name. This fixes the problems devtools' original scheme had, so I'm going back to that.

Diffstat (limited to 'pacman-extra.conf')

0 files changed, 0 insertions, 0 deletions


context:
space:
mode: