]> git.lizzy.rs Git - rust.git/commit
rollup merge of #24921: tamird/bitflags-associated-const
authorAlex Crichton <alex@alexcrichton.com>
Wed, 29 Apr 2015 22:49:07 +0000 (15:49 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 29 Apr 2015 22:49:07 +0000 (15:49 -0700)
commit2edb6438cb83c144f0ce480a47975043bbee2d4b
tree3b0ebb9195271dbb1310ce6f84794aa08761f8fe
parentcc04cd4bb169141c12b1f44ea75f265826dfbda9
parent8c58fe17393d01a3b1661cc43ec5ffcf005a0c1d
rollup merge of #24921: tamird/bitflags-associated-const

Conflicts:
src/librustc/lib.rs
src/librustc/lib.rs
src/librustc_llvm/lib.rs