1
0
mirror of https://github.com/github/gitignore synced 2024-06-03 11:18:12 +02:00

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

View File

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