← Back to branch summary

~ubuntu-branches/ubuntu/saucy/di/saucy

« back to all changes in this revision

Viewing changes to mkconfig/tests.d/incconflict.dat

  • Committer: Bazaar Package Importer
  • Author(s): Michael Ablassmeier
  • Date: 2010-08-08 22:40:18 UTC
  • mto: (3.1.5 sid) (1.1.11 upstream)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20100808224018-g3c2h2nlwtcd37ve
Import upstream version 4.26

Show diffs side-by-side

added added

removed removed

Lines of Context:
mkconfig/tests.d/incconflict.dat
 
1
output incconflict.ctest
 
2
loadunit c-main
 
3
loadunit c-include-conflict
 
4
hdr incconf1.h
 
5
hdr incconf2.h
 
6
hdr incconf3.h
 
7
include_conflict incconf1.h incconf2.h
 
8
include_conflict incconf1.h incconf3.h