Mercurial Mercurial > hg > stx-libtool / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bc.mak
branchjv
changeset 12205 f210b6224ef0
parent 12201 283826cb8bcc
child 12210 681e23c3e348 
--- a/bc.mak	Wed Mar 21 14:05:42 2012 +0000
+++ b/bc.mak	Wed Mar 21 17:50:14 2012 +0000
@@ -1,7 +1,15 @@
+<<<<<<< .working
 # $Header$
+=======
+# $Header: /cvs/stx/stx/libtool/bc.mak,v 1.117 2012/03/02 14:30:33 cg Exp $
+>>>>>>> .merge-right.r7949
 #
 # DO NOT EDIT
+<<<<<<< .working
 # automagically generated from the projectDefinition: stx_libtool at 2012-03-20 16:57:25.229.
+=======
+# automagically generated from the projectDefinition: stx_libtool at 2012-03-02 15:29:27.625.
+>>>>>>> .merge-right.r7949
 #
 # Warning: once you modify this file, do not rerun
 # stmkmp or projectDefinition-build again - otherwise, your changes are lost.
@@ -217,6 +225,7 @@
 $(OUTDIR)FileBasedSourceCodeManagementSettingsAppl.$(O) FileBasedSourceCodeManagementSettingsAppl.$(H): FileBasedSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)\stx\libtool\AbstractSourceCodeManagementSettingsAppl.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)FileBrowserV3.$(O) FileBrowserV3.$(H): FileBrowserV3.st $(INCLUDE_TOP)\stx\libtool\FileBrowserV2.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractFileBrowser.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)FindFileApplication.$(O) FindFileApplication.$(H): FindFileApplication.st $(INCLUDE_TOP)\stx\libtool\AbstractFileFinderApplicationComponent.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractFileApplicationNoteBookComponent.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)GitSourceCodeManagementSettingsAppl.$(O) GitSourceCodeManagementSettingsAppl.$(H): GitSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)\stx\libtool\AbstractSourceCodeManagementSettingsAppl.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)MercurialSourceCodeManagementSettingsAppl.$(O) MercurialSourceCodeManagementSettingsAppl.$(H): MercurialSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)\stx\libtool\AbstractSourceCodeManagementSettingsAppl.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)PerforceSourceCodeManagementSettingsAppl.$(O) PerforceSourceCodeManagementSettingsAppl.$(H): PerforceSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)\stx\libtool\AbstractSourceCodeManagementSettingsAppl.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)StoreSourceCodeManagementSettingsAppl.$(O) StoreSourceCodeManagementSettingsAppl.$(H): StoreSourceCodeManagementSettingsAppl.st $(INCLUDE_TOP)\stx\libtool\AbstractSourceCodeManagementSettingsAppl.$(H) $(INCLUDE_TOP)\stx\libtool\AbstractSettingsApplication.$(H) $(INCLUDE_TOP)\stx\libview2\ApplicationModel.$(H) $(INCLUDE_TOP)\stx\libview2\Model.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
hg/stx-libtool