Merge branch 'master' of git://repo.or.cz/clang
commitad03c02017ea0cc2fb748f6d858be11a0214d346
authorMartin Doucha <next_ghost@quick.cz>
Tue, 21 Jul 2009 20:22:05 +0000 (21 22:22 +0200)
committerMartin Doucha <next_ghost@quick.cz>
Tue, 21 Jul 2009 20:22:05 +0000 (21 22:22 +0200)
treef4497c003b7a0123fc95476b43795f5c02bc384c
parent279cc61da684ec8290a32e87e71a811883e68b0b
parentac8dae25856a59bbf77daeb2c62b639dd6a9ef9a
Merge branch 'master' of git://repo.or.cz/clang

Conflicts:
include/clang/Frontend/Analyses.def
lib/CodeGen/CGExprScalar.cpp
lib/Makefile
tools/clang-cc/Makefile
tools/clang-cc/clang-cc.cpp
tools/clang-cc/clang-cc.h
include/clang/Analysis/LocalCheckers.h
include/clang/Basic/Diagnostic.h
include/clang/Frontend/Analyses.def
lib/Basic/Diagnostic.cpp
lib/CodeGen/CGExprScalar.cpp
lib/Frontend/AnalysisConsumer.cpp
lib/Makefile
tools/clang-cc/Makefile
tools/clang-cc/clang-cc.cpp
tools/driver/driver.cpp