Merged with mainline

.cvsignore

@@ -1,13 +0,0 @@
-.bzr*
-.darcs*
-.git*
-.hg*
-_darcs
-B
-build*
-doxygen
-maint
-ChangeLog.cvs*
-GNUmakefile
-MMakefile
-TODO.*

.gitignore

@@ -1,13 +0,0 @@
-.bzr*
-.darcs*
-.git*
-.hg*
-_darcs
-B
-build*
-doxygen
-maint
-ChangeLog.cvs*
-GNUmakefile
-MMakefile
-TODO.*

.hgignore

@@ -0,0 +1,42 @@
+syntax: regexp
+
+^build
+^ChangeLog
+
+syntax: glob
+
+*.a
+*.d
+*.dll
+*.exe
+*.lib
+*.map
+*.o
+*.out
+*.py[cdo]
+*.so
+*.res
+*.ttp
+
+doc/*.1
+doc/*.doc
+doc/*.html
+
+src/MMakefile
+src/compress_nrv*
+src/*.rc
+
+stub/MMakefile
+stub/l_t_*.i
+stub/stamp-h
+stub/*.ash
+stub/*.asx
+stub/*.asy
+stub/*.bin
+stub/*.lst
+
+stub/util/armpe/armpe_tester
+
+stub/util/sstrip/amd64-linux-sstrip
+stub/util/sstrip/i386-linux-sstrip
+stub/util/sstrip/sstrip

.hgtags

@@ -1,6 +1,10 @@
-140415ffbcef86a42b4d672249927364430d3d38 release111
+140415ffbcef86a42b4d672249927364430d3d38 RELEASE_111
 223ac5b23f9731ceac9ff8d65167df4900776e36 RELEASE_190
+2c753c5bf38e7322715e2a5c6c5381111bd7a61a RELEASE_194
+2ee65b77f9117651e2e5517b2edede23698d73ca RELEASE_196
+70402aeee6e0e4fc2889658ed8cee44461c0b0a8 RELEASE_200
 a935d577fc7dd9c2c87761c9c702805da6ce1e51 RELEASE_193
+b0353253b0b3d062eb5adb50d4b665a96620da45 RELEASE_195
 c2e0cd4d621b047f254f2def42132a03683ff52c RELEASE_192
-eb1ce56dce7dd1835964362470610925963b9043 release110
+eb1ce56dce7dd1835964362470610925963b9043 RELEASE_110
 ed96891ef795bceec6b7ff3ca1ca7764431bfb39 RELEASE_191

Makefile

@@ -23,24 +23,11 @@ endif
 dist: distclean
 	false
 
-
+# automatically generate ChangeLog from hg
-ifneq ($(wildcard CVS/R*),)
+ChangeLog:
-CVS_ROOT := $(shell cat CVS/Root)
+	hg log --style=changelog > $@
-CVS_REPO := $(shell cat CVS/Repository)
-endif
-
-cvs-info:
-	@echo 'CVS info: $(CVS_ROOT) $(CVS_REPO)'
-
-cvs-admin-ko:
-	cvs admin -ko .
-	cvs -q -z6 update -P -d
-
-# automatically generate ChangeLog from CVS
-ChangeLog ChangeLog.cvs:
-	perl $(srcdir)/scripts/cvs2cl.pl --utc -f ChangeLog.cvs
 
 
 .PHONY: default all mostlyclean clean distclean maintainer-clean
-.PHONY: dist cvs-info cvs-admin-ko ChangeLog ChangeLog.cvs
+.PHONY: dist ChangeLog
 

doc/.cvsignore

@@ -1,6 +0,0 @@
-upx.1
-upx.doc
-upx.html
-upx.man
-upx.ps
-upx.tex

doc/.gitignore

@@ -1,6 +0,0 @@
-upx.1
-upx.doc
-upx.html
-upx.man
-upx.ps
-upx.tex

src/.cvsignore

@@ -1,20 +0,0 @@
-*.0??
-*.d
-*.dat
-*.idb
-*.img
-*.map
-*.raw
-*.rc
-*.rel
-*.res
-*.pdb
-*.out
-*.upx
-.gdbinit
-GNUmakefile
-MMakefile
-compress_nrv.*
-upx
-version1*.h
-version2*.h

src/.gitignore

@@ -1,20 +0,0 @@
-*.0??
-*.d
-*.dat
-*.idb
-*.img
-*.map
-*.raw
-*.rc
-*.rel
-*.res
-*.pdb
-*.out
-*.upx
-.gdbinit
-GNUmakefile
-MMakefile
-compress_nrv.*
-upx
-version1*.h
-version2*.h

src/stub/.cvsignore

@@ -1,18 +0,0 @@
-.*-stamp
-*.ah
-*.asx
-*.asy
-*.bin
-*.d
-*.i
-*.lst
-*.map
-*.o
-*.out
-*.tmp
-GNUmakefile
-MMakefile
-stamp-h
-stubify.exe
-upxb
-upxd

src/stub/.gitignore

@@ -1,18 +0,0 @@
-.*-stamp
-*.ah
-*.asx
-*.asy
-*.bin
-*.d
-*.i
-*.lst
-*.map
-*.o
-*.out
-*.tmp
-GNUmakefile
-MMakefile
-stamp-h
-stubify.exe
-upxb
-upxd

src/stub/util/armpe/.cvsignore

@@ -1 +0,0 @@
-armpe_tester

src/stub/util/armpe/.gitignore

@@ -1 +0,0 @@
-armpe_tester

src/stub/util/sstrip/.cvsignore

@@ -1,4 +0,0 @@
-amd64-linux-sstrip
-i386-linux-sstrip
-sstrip
-sstrip.exe

src/stub/util/sstrip/.gitignore

@@ -1,4 +0,0 @@
-amd64-linux-sstrip
-i386-linux-sstrip
-sstrip
-sstrip.exe