diff options
| author | theuni <theuni-nospam-@xbmc.org> | 2011-01-24 16:05:21 -0500 |
|---|---|---|
| committer | theuni <theuni-nospam-@xbmc.org> | 2011-01-24 16:05:21 -0500 |
| commit | c51b1189e3d5353e842991f5859ddcea0f73e426 (patch) | |
| tree | ef2cb8a6184699aa614f3655dca4ce661cdc108e /lib/jsoncpp/test/data/test_basic_04.expected | |
| parent | be61ebdc9e897fe40c6f371111724de79ddee8d5 (diff) | |
Merged cptspiff's code-reshuffle branch.
Squashed commit due to build breakage during code-reshuffle history.
Conflicts:
xbmc/Util.cpp
xbmc/cdrip/CDDARipper.cpp
xbmc/filesystem/Directory.cpp
xbmc/filesystem/File.cpp
Diffstat (limited to 'lib/jsoncpp/test/data/test_basic_04.expected')
| -rw-r--r-- | lib/jsoncpp/test/data/test_basic_04.expected | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/jsoncpp/test/data/test_basic_04.expected b/lib/jsoncpp/test/data/test_basic_04.expected new file mode 100644 index 0000000000..013f424f93 --- /dev/null +++ b/lib/jsoncpp/test/data/test_basic_04.expected @@ -0,0 +1,2 @@ +.="abcdef" + |