Don't ignore schematic files in examples/

.sch files were explicitly ignored, so that new files added to
examples/ were not seen.
Corrected this and cleaned up a bit the entire file, removing
duplicate lines and regrouping lines.

Added also ignoring generated .cpp files in
qucs/qucs-core/src/components/verilog/

.gitignore

@@ -1,12 +1,14 @@
-<<<<<<< HEAD
 # Qucs Specific #
-######################
+#################
 */src/qucsator
 */src/converter/qucsconv
 */src/gperfappgen
 qucs_typedefs.h
 */src/components/verilog/discipline.vams
 
+# Verilog-A generated files
+qucs-core/src/components/verilog/*.cpp
+
 # Following files generated by lex and yacc
 
 # qucsator generated files (in qucs-core/src)
@@ -88,7 +90,6 @@ Makefile.in
 Makefile
 stamp-h1
 missing
-configure
 config.guess
 config.h
 config.sub
@@ -102,7 +103,6 @@ depcomp
 install-sh
 libtool
 autom4te.cache/
-aclocal.m4
 auxconf/
 libltdl/
 libtool.m4
@@ -112,7 +112,6 @@ ltversion.m4
 lt~obsolete.m4
 ltmain.sh
 
-
 # Unknown #
 ###########
 *.output
@@ -128,6 +127,9 @@ ltmain.sh
 *.mex*
 *.pyc
 moc_*.cpp
+moc_*.cxx
+qrc_*.cpp
+qrc_*.cxx
 .libs
 
 # Packages #
@@ -174,35 +176,39 @@ qucs/contrib/doxygen/html/
 # created by Qt Creator
 CMakeLists.txt.user
 
+# emacs #
+#########
+# dot hash files (write locks)
+.\#*
 
-=======
-*.o
-*.cpp~
-*.h~
-qucsactivefilter
-*.pro.user
-Makefile
-moc_*.cpp
+# Qucs user files #
+###################
+# ignore schematics, data display and data
 *.sch
-*.sch~
-*.dat
 *.dpl
-qrc_*.cpp
-moc_*.cxx
-qrc_*.cxx
-CMakeFiles
-CMakeCache.txt
-*.cmake
-*.depends
+*.dat
+# except in the examples/ directory
+!examples/*.sch
+!examples/*.dpl
 
-# Xcode
+# Xcode #
+#########
 DerivedData
 *.build
 Debug
 *.xcodeproj
 
-#Others
+# Others #
+##########
 CMakeScripts
 *.cxx_parameters
 shadow
 
+########
+qucsactivefilter
+*.pro.user
+
+CMakeFiles
+CMakeCache.txt
+*.cmake
+*.depends