Commits · e4cc7a56ba069ba6dd159e5da4da8775a6a6d7a4 · Chris / gitignore · GitLab

Nov 08, 2013
- Merge with latest master from upstream. Fix merge conflict with Leiningen.gitignore · e4cc7a56
  Sean Brewer authored Nov 07, 2013
  
  e4cc7a56
- Merge pull request #509 from cjerdonek/master · bd8dab38
  Carl Suster authored Nov 07, 2013
  bd8dab38
- Make Python .gitignore directory entries match only directories. · c038e773
  Chris Jerdonek authored Jan 16, 2013
  c038e773
Nov 07, 2013
- Merge pull request #636 from msgerbush/patch-1 · b65855ee
  Adam Roben authored Nov 07, 2013
  b65855ee
- Merge branch 'master' into patch-1 · 95075ccc
  Michael Gerbush authored Nov 07, 2013
  95075ccc
- Merge pull request #501 from karenetheridge/master · 7bbc288b
  Adam Roben authored Nov 07, 2013
  7bbc288b
- Merge pull request #505 from abrodkin/qt-additions · f94c2a0b
  Adam Roben authored Nov 07, 2013
  f94c2a0b
- Merge pull request #522 from zellux/master · 6309a0ab
  Adam Roben authored Nov 07, 2013
  6309a0ab
- Merge pull request #379 from azzlack/master · d9b3471c
  Adam Roben authored Nov 07, 2013
  d9b3471c
- Merge pull request #503 from SimonSimCity/master · f4b8c481
  Adam Roben authored Nov 07, 2013
  f4b8c481
- Merge pull request #346 from bripkens/patch-1 · 834dc0a1
  Adam Roben authored Nov 07, 2013
  834dc0a1
- Merge pull request #352 from ghost/master · 9338b030
  Adam Roben authored Nov 07, 2013
  9338b030
- Merge pull request #350 from r1pp3rj4ck/patch-1 · 320a2c4e
  Adam Roben authored Nov 07, 2013
  320a2c4e
- Merge pull request #343 from jcowgill/master · eb49a83c
  Adam Roben authored Nov 07, 2013
  eb49a83c
- Merge pull request #634 from nikr/patch-1 · f5a760d2
  Carl Suster authored Nov 07, 2013
  f5a760d2
- add .brf for files generated by hyperref · f0036b5a
  Niklas Rehfeld authored May 01, 2013
  f0036b5a
- Merge pull request #453 from oschrenk/patch-1 · 48c38894
  Carl Suster authored Nov 06, 2013
  48c38894
- Merge pull request #618 from rayshan/patch-1 · 1db3f61e
  Carl Suster authored Nov 06, 2013
  1db3f61e
- Merge pull request #767 from lunks/remove-dot-project-from-rails-gitignore · b0e2d94e
  Carl Suster authored Nov 06, 2013
  b0e2d94e
Nov 06, 2013
- Merge pull request #643 from stationkeeping/patch-1 · db625a10
  Carl Suster authored Nov 06, 2013
  db625a10
- Merge pull request #821 from healsdata/master · 49d7fbfc
  Adam Roben authored Nov 06, 2013
  49d7fbfc
- Allow the Vagrantfile to be tracked as that's the intended purpose. · c1af2ae8
  Jonathan Campbell authored Nov 05, 2013
  c1af2ae8
- Merge pull request #398 from huxuan/master · 8e101905
  Carl Suster authored Nov 05, 2013
  8e101905
- Merge pull request #438 from ChristianBoehlke/master · de4f9eff
  Carl Suster authored Nov 05, 2013
  de4f9eff
Nov 05, 2013
- Merge pull request #315 from torbjoernk/global_add_kdevelop · 7e4feaf6
  Justin Spahr-Summers authored Nov 05, 2013
  7e4feaf6
- Merge pull request #826 from cobyism/rework-contributing-guides · 6188909b
  Coby Chapple authored Nov 05, 2013
  6188909b
- extract out new contributing guidelines to CONTRIBUTING.md · 7375f82f
  Coby Chapple authored Nov 05, 2013
  
  7375f82f
- Merge pull request #302 from bakkdoor/master · 798d9f15
  Adam Roben authored Nov 05, 2013
  798d9f15
- Merge pull request #300 from pangratz/add_texlipse · 1099dea3
  Adam Roben authored Nov 05, 2013
  1099dea3
- Merge pull request #232 from tomparle/patch-1 · 47ebff05
  Adam Roben authored Nov 05, 2013
  47ebff05
- Merge pull request #820 from harshadsabne/master · 7ff92c89
  Adam Roben authored Nov 05, 2013
  7ff92c89
- Merge pull request #825 from tamird/patch-1 · 5d2836f9
  Adam Roben authored Nov 05, 2013
  5d2836f9
- Merge pull request #827 from trevorsheridan/master · 908bb556
  Adam Roben authored Nov 05, 2013
  908bb556
- Merge pull request #693 from nichtich/patch-1 · b5f5b0f2
  Adam Roben authored Nov 05, 2013
  b5f5b0f2
- Merge pull request #434 from Skyr/master · fa55a30a
  Adam Roben authored Nov 05, 2013
  fa55a30a
- Ignore cache and history (created by SBT >=0.12) · 02aa9eb7
  Stefan Schlott authored Sep 20, 2012
  
  02aa9eb7
- add a section about not including every template under the sun · ad1a26d5
  Coby Chapple authored Nov 05, 2013
  
  ad1a26d5
- reword one-file-per-commit guideline to be about keeping PRs atomic · ede3453e
  Coby Chapple authored Nov 05, 2013
  
  ede3453e
Nov 04, 2013
- Merge pull request #526 from bdukes/patch-2 · 6665f370
  Markus Olsson authored Nov 04, 2013
  6665f370
- Cleaning up Objective-C .gitignore and adding OS X section · ebe2e3e5
  Trevor Sheridan authored Nov 04, 2013
  
  ebe2e3e5