Dummy C test file for quick Compare testing
No need to track stuffs generated by compiler
Merge remote branch 'origin/v1.5.7'
Update project file to make it compile
Update Scintilla header
Remove embedded N++ - it doesn't make sense to have a copy within the plugin
Update for 1.5.7 release
Update Compare source code to GPLv3
Rely on constant defined by Scintilla
Update readme
Cleaning code + cosmetics
Cosmetics
Fix case statement + const correctness
small script to update N++ compare dll
Cleaning directory
Update readme
Update to GPLv3 - continued
Better gitignore
More clever shortcut removal + fixed menu items disabling
Merge remote-tracking branch 'remotes/jsleroy/master'

Conflicts:
	Notepad++/SciLexer.dll
	Notepad++/config.xml
	Notepad++/contextMenu.xml
	Notepad++/notepad++.exe
	Notepad++/shortcuts.xml
	readme.txt
	src/Compare.cpp
	src/Compare.h
	src/Compare.rc
	src/Engine.cpp
	src/NPPHelpers.cpp
	src/NavDlg/NavDialog.cpp