Merge branch 'cncpp'
authorRobin Luckey <robin@Tangier.local>
Fri, 14 Mar 2008 21:35:12 +0000 (14:35 -0700)
committerRobin Luckey <robin@Tangier.local>
Fri, 14 Mar 2008 21:35:12 +0000 (14:35 -0700)
commit11653d2154f46ac5076effeccc5e8a9db11cbdc8
treef0819ac941ad212247d532c9802436a3e17fbbee
parent1311be2abb56f15be166183c6135216546c35833
parent629f9cab359caeb39a81c40233f3369d904a7629
Merge branch 'cncpp'

Conflicts:

ext/ohcount_native/generator.rb
lib/ohcount/detector.rb
ext/ohcount_native/generator.rb
lib/ohcount/detector.rb
lib/ohcount/sloc_info.rb
test/expected_dir/c2.h.in/c/blanks
test/expected_dir/c2.h.in/c/code
test/expected_dir/c2.h.in/c/comment
test/expected_dir/c_str.c/c/blanks
test/expected_dir/c_str.c/c/code
test/expected_dir/c_str.c/c/comment
test/unit/c_test.rb