summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-06-28 08:09:49 -0700
committerDan Nicholson <dbn.lists@gmail.com>2010-06-28 08:09:49 -0700
commit52012140bffb725452eeeeb5913b553800c4ec32 (patch)
tree25b48c88bf878d6426bd3ae3709138f0e538b902 /CHANGES
parent115dc059fd1a7d480ac37226ddf551059928d704 (diff)
parent9da20dd6962d6704f4c3517993b633392a3efadd (diff)
Merge remote branch 'whot/master'HEADmaster
Conflicts: xts5/Makefile.am Moved the DISPLAY check to the top-level Makefile.am where check-local is now defined.
Diffstat (limited to 'CHANGES')
0 files changed, 0 insertions, 0 deletions