usa be36df7f55 merge revision(s) 35112,35121: [Backport #6190] ... * transcode.c (str_encode_bang, encoded_dup): if nothing was transcoded, just set encoding but leave coderange unchanged as forcee_encoding. [ruby-core:43557][Bug #6190] * transcode.c (documentation for str_encode): Explain that transcoding to the same encoding is a no-op (i.e. no exceptions, no replacements,...). [ruby-core:43557][Bug #6190] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@40056 b2dd03c8-39d4-4d8f-98ff-823fe69b080e		2013-04-02 04:13:32 +00:00
..
-ext-	merge revision(s) 32826,34732: [Backport #6681]	2012-10-26 03:01:41 +00:00
base64
benchmark	* lib/benchmark.rb: merge eregon/benchmark.	2011-06-28 06:09:46 +00:00
bigdecimal	merge revision(s) 38801,38809,38810: [Backport #7404]	2013-01-15 07:22:50 +00:00
cgi	merge revision(s) 35591: [Backport #7317]	2012-11-09 06:29:00 +00:00
coverage	merge revision(s) 33030:	2012-01-03 00:27:45 +00:00
csv	merge revision(s) 36332:	2012-11-09 07:16:02 +00:00
date	merge revision(s) 34335,34337:	2012-02-06 12:29:54 +00:00
dbm	merge revision(s) 34646:	2012-02-17 01:14:57 +00:00
digest	* backport r32546 from trunk.	2011-07-15 03:05:23 +00:00
dl	merge revision(s) 38202,38238,38324,38326: [Backport #7527]	2012-12-20 09:52:46 +00:00
drb	merge revision(s) 35451:	2012-05-19 05:42:43 +00:00
erb	reverted r38318.	2012-12-13 05:24:26 +00:00
etc	merge revision(s) 36636:	2012-10-25 09:11:09 +00:00
fiddle	merge revision(s) 34626,34627:	2012-02-15 21:31:16 +00:00
fileutils	merge revision(s) 32707:	2011-07-27 15:33:56 +00:00
gdbm	merge revision(s) 33673:	2012-02-08 00:46:28 +00:00
iconv	merge revision(s) 34750:	2012-02-22 15:15:17 +00:00
io	merge revision(s) 34917:	2012-03-06 03:48:34 +00:00
irb	merge revision(s) 34395:	2012-02-14 06:45:33 +00:00
json	* ext/json: Import JSON 1.5.5.	2013-02-13 07:18:58 +00:00
logger	merge revision(s) 35591: [Backport #7317]	2012-11-09 06:29:00 +00:00
matrix	* test/matrix/test_matrix.rb: remove obsolete test [ruby-core:37714]	2011-07-01 22:25:32 +00:00
minitest	backported 33102 from trunk	2011-08-27 20:37:05 +00:00
misc	Skip test_array_literal. [Backport #5369]	2011-10-09 15:10:13 +00:00
mkmf	* lib/mkmf.rb (find_executable0): should exclude directories.	2011-03-11 09:42:46 +00:00
monitor
net	* test/net/protocol/test_protocol.rb: the backported test assumed that the	2013-01-15 08:46:31 +00:00
nkf
objspace
open-uri	* remove trailing spaces.	2011-05-15 11:55:52 +00:00
openssl	merge revision(s) 35159: [Backport #7980]	2013-03-28 09:19:07 +00:00
optparse	merge revision(s) 35467:	2012-04-24 20:57:07 +00:00
ostruct	merge revision(s) 34755:	2012-02-24 14:49:51 +00:00
pathname	merge revision(s) 32826,34732: [Backport #6681]	2012-10-26 03:01:41 +00:00
psych	merge revision(s) r36583, r36458, r36414, r36103, r35690, r35681, r35658, r35657, r35655, r35492: [Backport #6815]	2012-08-07 20:50:05 +00:00
rake	Revert r33276.	2011-09-15 15:35:58 +00:00
rdoc	merge revision(s) 33902:	2012-02-14 07:55:37 +00:00
readline	merge revision(s) 34268:	2012-02-17 03:27:02 +00:00
resolv
rexml	merge revision(s) 39384:	2013-02-22 09:37:09 +00:00
rinda	merge revision(s) 33196:	2012-04-27 02:10:17 +00:00
ripper	merge revision(s) 38235: [Backport #7255]	2012-12-11 10:17:13 +00:00
rss
ruby	merge revision(s) 35112,35121: [Backport #6190]	2013-04-02 04:13:32 +00:00
rubygems	merge revision(s) 37032:	2012-10-25 09:16:08 +00:00
scanf
sdbm
socket	merge revision(s) 35474,35479,38939,38943,38963,38991,38994: [Backport #7786]	2013-02-06 05:30:55 +00:00
stringio	* ext/stringio/stringio.c (strio_read): return new string if nil	2011-08-20 01:43:26 +00:00
strscan
syck	merge revision(s) 34908:	2012-03-06 02:43:21 +00:00
testunit	* test/testunit/test_parallel.rb: pass "--ruby" option to	2011-08-02 11:26:21 +00:00
thread	* remove trailing spaces.	2011-05-15 11:55:52 +00:00
uri	merge revision(s) 36852:	2012-08-30 16:21:44 +00:00
webrick	merge revision(s) 33772:	2012-08-27 15:40:30 +00:00
win32ole	merge revision(s) 39809,39834,39837: [Backport #8132]	2013-03-21 11:35:20 +00:00
xmlrpc	* backport r32856 from trunk.	2011-08-12 08:06:49 +00:00
zlib	merge revision(s) 34552: [Bug #6516]	2012-05-30 08:21:16 +00:00
inlinetest.rb
profile_test_all.rb
runner.rb	* common.mk (RUN_OPT): disable gems.	2011-07-08 23:39:42 +00:00
test_cmath.rb	Rerefix test introduced by r32307.	2011-06-30 03:31:01 +00:00
test_delegate.rb
test_find.rb
test_ipaddr.rb
test_mathn.rb
test_mutex_m.rb
test_open3.rb
test_pp.rb
test_prettyprint.rb
test_prime.rb	* test/syck/test_string.rb (Syck::TestString#test_non_binary_string):	2011-02-13 00:56:44 +00:00
test_pstore.rb	merge revision(s) r33265:	2011-10-10 23:14:17 +00:00
test_pty.rb	merge revision(s) 34106:	2012-04-15 05:57:08 +00:00
test_securerandom.rb	* test/test_securerandom.rb: Add testcase. This testcase does NOT aim	2011-06-16 10:32:51 +00:00
test_set.rb
test_shellwords.rb	merge revision(s) 34284:34286:	2012-02-12 07:51:05 +00:00
test_singleton.rb	* test/test_singleton.rb: Add tests from lib/singleton.rb. Patch by	2011-05-17 18:15:10 +00:00
test_syslog.rb	merge revision(s) 32859:	2011-08-07 15:11:03 +00:00
test_tempfile.rb	* test/test_tempfile.rb: simply ignore platform depedent testcases	2011-04-04 02:51:17 +00:00
test_time.rb	merges r33398 from trunk into ruby_1_9_3.	2011-10-09 13:19:32 +00:00
test_timeout.rb
test_tracer.rb	* lib/tracer.rb: Tracer.on only if required by -r command-line option.	2011-06-29 13:19:59 +00:00
test_tsort.rb
with_different_ofs.rb