Rudolf Polzer
f7ae89c6d9
new versions of the libs, this time with rijndael in separate lib
2010-07-26 15:50:04 +02:00
Rudolf Polzer
e53394c7ff
Merge branch 'master' into divVerent/crypto2
2010-07-26 14:36:38 +02:00
Rudolf Polzer
74ee735ed3
add d0_blind_id DLLs to our DLL dump
2010-07-26 14:36:18 +02:00
Rudolf Polzer
8640529781
Merge branch 'master' into divVerent/crypto2
...
Conflicts:
all
2010-07-26 14:34:39 +02:00
Rudolf Polzer
ae6e74a75c
update win32 modplug dll
2010-07-26 14:05:55 +02:00
Rudolf Polzer
ffc63e8d51
mark libcurl-4.dll unexecutable (means nothing to Windows, but I know it needs to be rebuilt)
2010-07-26 13:54:49 +02:00
Rudolf Polzer
cfb1bdfa33
buildfiles: rename dir from w32 to win32
2010-07-26 13:35:34 +02:00
Rudolf Polzer
060f3d257f
linux64 library dependencies for use by build script
2010-07-26 13:32:20 +02:00
Rudolf Polzer
97cb7ae4fd
fix some typos in ./all
2010-07-26 13:22:52 +02:00
Rudolf Polzer
39e60744ad
Merge remote branch 'origin/master' into divVerent/crypto2
2010-07-23 08:44:40 +02:00
Rudolf Polzer
5df4279b76
fix admin-merge :P
2010-07-21 20:13:54 +02:00
Rudolf Polzer
f665e3c467
small syntax fix
2010-07-21 20:01:32 +02:00
Rudolf Polzer
c6ea9d406d
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
2010-07-21 20:01:03 +02:00
Rudolf Polzer
a1f2cac462
also add -fastbounce by default. Though there is no -bounce in the default settings, this allows bounces to be fast even if --no-fast is used. If you do not want this, also add --no-fastbounce.
2010-07-21 16:06:30 +02:00
Rudolf Polzer
e2cc38fb4e
add default options -fast and -dirty. If you do not want them, add --no-fast or --no-dirty behind the + in your map options file
2010-07-21 16:02:35 +02:00
Rudolf Polzer
6b75ef0f42
map compiler: allow an option --no-fast that removes a -fast option (possibly including argument) from the command line
2010-07-21 15:54:13 +02:00
Rudolf Polzer
a2fd478196
fix typo
2010-07-21 15:05:51 +02:00
Rudolf Polzer
ae02c9f56e
REALLY fix timeout feature
2010-07-21 15:03:35 +02:00
Rudolf Polzer
ad6535cc2a
also touch all files, to make git actually reread them
2010-07-21 11:10:14 +02:00
Rudolf Polzer
7a079c940d
add back the autocrlf config option in ./all - yes, had to
...
At least .gitattributes turns it off again on non-text files.
2010-07-21 11:04:49 +02:00
Rudolf Polzer
e0d2025eb1
fix another typo
2010-07-21 10:52:05 +02:00
Rudolf Polzer
cd29375017
CRLF fixes, .gitattributes file updated
2010-07-21 10:50:11 +02:00
Rudolf Polzer
f8dbe45038
CRLF fixes, .gitattributes file updated
2010-07-21 10:50:04 +02:00
Rudolf Polzer
a49e5ec8c1
the "*" rule must come first
2010-07-21 10:49:48 +02:00
Rudolf Polzer
c69c948d1e
also add the attributes file
2010-07-21 10:47:39 +02:00
Rudolf Polzer
6b94755796
checkout master again
2010-07-21 10:34:06 +02:00
Rudolf Polzer
c9bc849a1e
always return true
2010-07-21 10:32:45 +02:00
Rudolf Polzer
59db5c8c63
CRLF fixes, .gitattributes file updated
2010-07-21 10:30:31 +02:00
Rudolf Polzer
13e85619f2
CRLF fixes, .gitattributes file updated
2010-07-21 10:30:26 +02:00
Rudolf Polzer
e27b6944b1
fix usage of HEAD
2010-07-21 10:29:40 +02:00
Rudolf Polzer
ee731ded7d
more fixing
2010-07-21 10:26:47 +02:00
Rudolf Polzer
8d2322dbfc
add a gitattributes helper script
2010-07-21 10:24:45 +02:00
Rudolf Polzer
36c7a9e93b
gitattributes: add a default crlf value
2010-07-21 09:57:31 +02:00
Rudolf Polzer
c0386f2fba
better time measuring
2010-07-19 14:40:45 +02:00
Rudolf Polzer
eeb4e981e7
more timeout fixing
2010-07-19 14:39:21 +02:00
Rudolf Polzer
9ac2d431c5
cut down hashes also on finished compile
2010-07-19 09:23:14 +02:00
Rudolf Polzer
d95dde1cc4
fixes :P
2010-07-19 09:16:54 +02:00
Rudolf Polzer
75840126be
fix timeouts
2010-07-19 08:34:34 +02:00
Rudolf Polzer
3a27e02f3a
autobuild scripts: specify timeouts for the q3map2 stages
2010-07-19 08:33:26 +02:00
Rudolf Polzer
627ef87743
hope this will yield useful exit status
2010-07-19 07:58:50 +02:00
Rudolf Polzer
8bfb119d5e
treat 404 as warning, not error
2010-07-18 19:08:13 +02:00
Rudolf Polzer
b730d3b2c8
hard exit 1 if a "cd" failed :(
2010-07-18 17:18:15 +02:00
Rudolf Polzer
728f152c1d
new key_0, Xon//KssdlzGkFKdnnN4sgg8H+koTbBn5JTi37BAW1Q=
2010-07-17 20:57:22 +02:00
Rudolf Polzer
5113a5571a
new key_15 = TEST5XYWfX09i5/ekwTd1cJkalvnR3A1AvBlFPijhE0=
2010-07-17 19:56:31 +02:00
terencehill
91bab28ba3
Show "(no_branch)" instead of "(no" in the output of the command branches (for example when you are in a remote branch)
2010-07-17 17:26:28 +02:00
Rudolf Polzer
14253bf229
Merge remote branch 'origin/master' into divVerent/crypto2
...
Conflicts:
all
2010-07-17 17:05:09 +02:00
terencehill
305f923b43
Fix compile command to handle correctly the optional argument <client>
...
In case the first arg (eventually after -c|-n):
- it's an empty string "" just skip it (default clients will be used).
- doesn't contain any valid client, then assume it's not a client option but a generic option.
- contains at least one valid client, then compile valid ones and warn about invalid ones.
Now finally
./all compile -n FTEQCCFLAGS_WATERMARK=
works :)
2010-07-17 17:02:06 +02:00
Rudolf Polzer
4c6e2486ff
improve ircspam
2010-07-17 15:40:04 +02:00
Rudolf Polzer
94ce252c0a
autobuild: improve messages, detect exit status
2010-07-17 15:18:14 +02:00
Rudolf Polzer
6cc00fffaf
admin-merge: use --no-ff
2010-07-16 23:44:35 +02:00
