e11ba04bfb
Conflicts: .gitignore SparkleShare/SparkleIntro.cs SparkleShare/SparkleShare.cs SparkleShare/SparkleUI.cs
49 lines
690 B
Plaintext
49 lines
690 B
Plaintext
*~
|
|
.DS_Store
|
|
*.exe
|
|
*.exe.mdb
|
|
*.userprefs
|
|
*.app
|
|
*.pidb
|
|
*.gmo
|
|
*.bak
|
|
*.suo
|
|
*.sln.cache
|
|
po/POTFILES
|
|
Makefile.in
|
|
Makefile
|
|
POTFILES
|
|
intltool-*
|
|
configure
|
|
config.guess
|
|
config.h
|
|
config.h.in
|
|
config.log
|
|
config.status
|
|
config.sub
|
|
INSTALL
|
|
aclocal.m4
|
|
autom4te.cache/
|
|
bin/
|
|
obj/
|
|
install-sh
|
|
libtool
|
|
ltmain.sh
|
|
missing
|
|
po/.intltool-merge-cache
|
|
po/Makefile.in.in
|
|
po/stamp-it
|
|
SparkleLib/AssemblyInfo.cs
|
|
build/m4/shave/shave
|
|
build/m4/*.m4
|
|
build/m4/shave/shave-libtool
|
|
SparkleLib/Defines.cs
|
|
SparkleLib/windows/Defines.cs
|
|
SparkleLib/windows/GlobalAssemblyInfo.cs
|
|
SparkleShare/sparkleshare
|
|
po/sparkleshare.pot
|
|
SparkleShare/Nautilus/sparkleshare-nautilus-extension.py
|
|
gnome-doc-utils.make
|
|
/sparkleshare-*
|
|
desktop.ini
|