Develop branch

.gitattributes

@@ -0,0 +1,66 @@
+[core]
+autocrlf=true
+
+# Set the default behavior, in case people don't have core.autocrlf set.
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.cpp text
+*.c text
+*.h text
+
+# Declare files that will always have LF line endings on checkout.
+*.md text eol=lf
+*.txt text eol=lf
+# pascal
+*.pas text eol=lf
+*.lfm text eol=lf
+*.inc text eol=lf
+*.lrs text eol=lf
+*.lpk text eol=lf
+*.lpi text eol=lf
+*.lpr text eol=lf
+# fastr-report xml template
+*.fr3 text eol=lf
+# web
+*.html text eol=lf
+*.css text eol=lf
+*.js text eol=lf
+# scrpts
+*.php text eol=lf
+*.lua text eol=lf
+*.sh text eol=lf
+*.py text eol=lf
+# config
+*.json text eol=lf
+*.yml text eol=lf
+*.xml text eol=lf
+*.sql text eol=lf
+# images
+*.svg text eol=lf
+# ini
+*.ini text eol=lf
+# geoposition xml
+*.gpx text eol=lf
+*.osm text eol=lf
+# git
+.gitmodules text eol=lf
+.gitattributes text eol=lf
+.gitignore text eol=lf
+
+# Declare files that will always have CRLF line endings on checkout.
+*.reg text eol=crlf
+*.cmd text eol=crlf
+*.bat text eol=crlf
+*.ps1 text eol=crlf
+*.sln text eol=crlf
+*.bpr text eol=crlf
+*.dpr text eol=crlf
+*.dproj text eol=crlf
+*.dfm text eol=crlf
+*.dof text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.png binary
+*.jpg binary
+*.bmp binary

.gitignore

@@ -1,12 +1,85 @@
-*.bak
-*.dbg
+# Uncomment these types if you want even more clean repository. But be careful.
+# It can make harm to an existing project source. Read explanations below.
+#
+# Resource files are binaries containing manifest, project icon and version info.
+# They can not be viewed as text or compared by diff-tools. Consider replacing them with .rc files.
+#*.res
+#
+# Type library file (binary). In old Delphi versions it should be stored.
+# Since Delphi 2009 it is produced from .ridl file and can safely be ignored.
+#*.tlb
+#
+# Diagram Portfolio file. Used by the diagram editor up to Delphi 7.
+# Uncomment this if you are not using diagrams or use newer Delphi version.
+#*.ddp
+#
+# Visual LiveBindings file. Added in Delphi XE2.
+# Uncomment this if you are not using LiveBindings Designer.
+#*.vlb
+#
+# Deployment Manager configuration file for your project. Added in Delphi XE2.
+# Uncomment this if it is not mobile development and you do not use remote debug feature.
+#*.deployproj
+#
+# C++ object files produced when C/C++ Output file generation is configured.
+# Uncomment this if you are not using external objects (zlib library for example).
+#*.obj
+#
+
+# Delphi compiler-generated binaries (safe to delete)
 *.exe
-*.lps
-backup/*
+*.dll
+*.bpl
+*.bpi
+*.dcp
+*.so
+*.apk
+*.drc
+*.map
+*.dres
+*.rsm
+*.tds
+*.dcu
+*.lib
+*.a
+*.o
+*.ocx
+
+# Delphi autogenerated files (duplicated info)
+*.cfg
+*.hpp
+*Resource.rc
+
+# Delphi local files (user-specific info)
+*.local
+*.identcache
+*.projdata
+*.tvsconfig
+*.dsk
+
+# Delphi history and backups
+__history/
+__recovery/
+*.~*
+
+# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
+*.stat
+
+# Boss dependency manager vendor folder https://github.com/HashLoad/boss
+modules/
+
+# Lazarus
+backup/
 backup
+lib/
 lib
 debug
+
+*.bak
+*.dbg
+*.lps
 *.res
+
 *.lrt
 *.o
 *.ppu
@@ -18,4 +91,7 @@ debug
 test/test_bccombobox/test_bccombobox
 !images/bgracontrols_images.res
 
+# MacOS X
 .DS_Store
+
+*.lrt