Skip to content

Commit

Permalink
Merge branch 'master' into 314
Browse files Browse the repository at this point in the history
  • Loading branch information
@gbirchmeier
gbirchmeier committed Jun 9, 2015
2 parents b132023 + 74eba12 commit bb191ce
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ AcceptanceTest/bin/
AcceptanceTest/obj/
AcceptanceTest/log/
AcceptanceTest/store/
AcceptanceTest/cfg/at.cfg
Examples/Executor/bin/*
Examples/Executor/obj/*
Examples/Executor/log/
Expand Down

0 comments on commit bb191ce

Please sign in to comment.