htcuniversal: A bit of merge funkyness due to vimdiff braindeadness.
authorPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:37:18 +0000 (18:37 +0000)
committerPaul Sokolovsky <pmiscml@gmail.com>
Tue, 17 Oct 2006 18:37:18 +0000 (18:37 +0000)
commit1db82e21cfdf7088821985aaf0c2f83ac80c7f0b
treeedc5e0ccb2ac56d383b0f8e9dc08ed92dffa4861
parent5730a399e4b393861802da84f1417ce840db73c1
htcuniversal: A bit of merge funkyness due to vimdiff braindeadness.
conf/machine/htcuniversal.conf