diff options
| author | Carl Suster <carl@contraflo.ws> | 2014-04-24 12:51:19 +1000 |
|---|---|---|
| committer | Carl Suster <carl@contraflo.ws> | 2014-04-24 12:51:19 +1000 |
| commit | 8b74c862f313de35a032cf34c6ecc4fd287ce947 (patch) | |
| tree | 8855c0aec44cd11a27bf8010bbae0a5be18e7b78 | |
| parent | b412c0164a1bccdc295964dc8564f68637ae33c8 (diff) | |
| parent | 4ded81fb2eff9336de6912adfa391b4892f5f192 (diff) | |
| download | gitignore-8b74c862f313de35a032cf34c6ecc4fd287ce947.tar.gz gitignore-8b74c862f313de35a032cf34c6ecc4fd287ce947.zip | |
Merge pull request #1045 from DaikiMaekawa/master
Fixed that the ROS.gitignore was not functioning properly
| -rw-r--r-- | ROS.gitignore | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/ROS.gitignore b/ROS.gitignore index 7b171072..f8bcd117 100644 --- a/ROS.gitignore +++ b/ROS.gitignore @@ -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 .#* |