resolved conflict; added missing files

2013-06-09 23:33:32 +02:00 · 2013-06-09 23:33:32 +02:00 · 3f35e2d39e
commit 3f35e2d39e
parent 23ef565a3c 97eb4bd0ff
14 changed files with 657 additions and 327 deletions
--- a/doc/advopt.txt
+++ b/doc/advopt.txt
@ -12,6 +12,8 @@ Advanced commands:
  //check                   checks the project for syntax and semantic
  //idetools                compiler support for IDEs: possible options:
    --track:FILE,LINE,COL   track a file/cursor position
+    --trackDirty:DIRTY_FILE,ORIG_FILE,LINE,COL
+                            track a file, currently not saved to disk
    --suggest               suggest all possible symbols at position
    --def                   list all possible definitions at position
    --context               list possible invokation context