Merge pull request #1045 from DaikiMaekawa/master

Fixed that the ROS.gitignore was not functioning properly
This commit is contained in:
Carl Suster 2014-04-24 12:51:19 +10:00
commit 8b74c862f3
1 changed files with 16 additions and 21 deletions

View File

@ -1,30 +1,25 @@
~$
.swp$
build/
bin/
lib/
msg_gen/
srv_gen/
msg/.*Action\.msg$
msg/.*ActionFeedback\.msg$
msg/.*ActionGoal\.msg$
msg/.*ActionResult\.msg$
msg/.*Feedback\.msg$
msg/.*Goal\.msg$
msg/.*Result\.msg$
msg/_.*\.py$
\.pcd$
.pyc$
msg/*Action.msg
msg/*ActionFeedback.msg
msg/*ActionGoal.msg
msg/*ActionResult.msg
msg/*Feedback.msg
msg/*Goal.msg
msg/*Result.msg
msg/_*.py
# Generated by dynamic reconfigure
\.cfgc$
*.cfgc
/cfg/cpp/
/cfg/.*\.py$
/cfg/*.py
# Ignore generated docs
.dox$
.wikidoc$
*.dox
*.wikidoc
# eclipse stuff
.project
@ -33,9 +28,9 @@ msg/_.*\.py$
# qcreator stuff
CMakeLists.txt.user
srv/_.*\.py$
\.pcd$
.pyc$
srv/_*.py
*.pcd
*.pyc
qtcreator-*
*.user
@ -43,7 +38,7 @@ qtcreator-*
/planning/docs
/planning/src
*~$
*~
# Emacs
.#*