jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'mozilla/master'

Browse source 
Conflicts:
	.gitignore
	support/cockpit
This commit is contained in:
Fabian Jakobs 2011-01-10 12:50:28 +01:00
commit 5cc67ba146
4 changed files with 14 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.gitignore vendored
View file

@ -1,4 +1,14 @@
# Junk that could exist anywhere:
.DS_Store
*.swp
*.tmp
# Project files that should not be in the repo
.project
.settings/
.settings.xml
.settings.xml.old
.*.gz
.*.gz
# A handy place to put stuff that git should ignore:
/ignore/