labofsahil/github-event-dataset-2012 huggingface dataset:
NSTimer fixes.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2247 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Change visibility to private.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2250 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Regenerate iOS wrapper.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2252 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
skeletons for NSTimer

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2259 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
NSTimer - bug fix

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2261 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Fix memory leak in NSObject finalizer.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2262 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Remove memory leak in NSTimer.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2263 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Don't save delegate in a global ArrayList. It is already referenced by
the NSTimer instance.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2264 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Fix race condition when releasing objects.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2265 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Run View.postInvalidate() on UI thread.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2266 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Call Runnable before removing it.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2267 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Keep NSTimer instances in a global array while they are active.

git-svn-id: http://xmlvm.svn.sourceforge.net/svnroot/xmlvm/trunk/xmlvm@2268 0874c2aa-48f6-4a0f-8a6b-e32f4465a257
Jit fixes, test update
sceKernelStartThread(): skip argPtr for 0 args.

This makes threads/semaphores pass, so adding to passing list.
Depends on an update to pspautotests.
Xinput input support

Picks the first Xinput device available, waits 100 frames between
retries when no devices are available.

Controls are hardcoded so every x360 controller button corresponds
to the PSP button in the same physical position. Input from right
stick and from analog triggers is ignored.

The Xinput code though is overriden by SampleControls' hardcoded
keyboard input. XinputDevice was tested to work with
samples/controller/basic when SampleControls is disabled.
Add a class for keyboard input

Removes the windows-specific hack from sceCtrl
to read keyboard input and instead add a hack to
PPSSPPWindows.

The input mapping is still hardcoded and is the same
as it was in sceCtrl.

Add an std::list to WindowsHost that, curretly, contains
a hardcoded list of preferred `InputDevice`s. Devices
are tried in-order until one of them reports success.
Xinput is preferred over Keyboard. Keyboard always
returns success. Pointers are stored in the std::list
for polymorphism.

Change XinputDevice to report failure as soon as a
device can't be queried, instead of only a frame later.
Merge pull request #42 from Kovensky/xinput

Xinput input support
Merge pull request #43 from unknownbrackets/master

Make threads/semaphores pass, fixing sceKernelStartThread
Merge pull request #44 from tmaul/master

Default to english psp emulation
Merge branch 'master' of github.com:hrydgard/ppsspp

Conflicts:
	pspautotests
	test.py
malloc test is now working
Add XInput.lib to the Release configuration.

Was added to debug only, so Release doesn't build, preventing tests.
I think x64 is broken also.
Add XInput.lib to other configurations.

Makes 64 bit etc. work as well.
Merge pull request #45 from unknownbrackets/master

Include XInput.lib in all configurations
Clean up SDL/CMakeLists, clean up Blackberry build process, further reduce memory allocation (needed for Dev Alpha)
Buildfix, bugfix. Fixes issue 46.
Update tests
Fix the list of libraries for one more build type in the vcxproj
Fix for file UI on Blackberry
Merge pull request #47 from xsacha/master

Blackberry 10 port
This is used by a couple of games.

stubbed out to make them shutup.
A few more stubs

Stubbed out some missing inet functions used by a couple of games
Update to gljeremy fork
BIRD python pexpect handling fixed.
specific versions for modules
to express-3.0.0rc4, node-0.8.9 and underscore-1.3.3
an idea of top design
@media queries sample
read more by click (but doesn't work on iPhone/iPad)
a jade filter of jumly
using jumly-jade module
use jade-filters module
解决提示信息乱码 ，比如UI标签中文乱码
Microposts added and new Menu structure introduced
First complete internationalized version
Fixed call to old FormatNegotiator constructor + add tests
upublicznienie bazy danych
Merge remote branch 'origin/develop' into develop
Cleaned .gitignore file.

[ci skip]
sumup.py
Add function to parse the date from ISO8601 to RFC2822 because IS08601 is not supported in IE8
updating disqus settings
tweaking for group.var=NULL
altered the main help page
removed docx as it seems to not work.
modified:   usr/local/share/doc/tdw/how_do_i/perl/FAQ.perl.tdw
Merge branch 'master' of github.com:troywill/tdw
Removed CLI, turned binary into a daemon

- Removed the Thor script Postal::Command
- Replaced the contents of `bin/postal` with a simple script that runs
  Daemons.run('./lib/server.rb'). The code for running the Newman app
  now lives in that file.
- That server app still doesn't really work right. I think it might be
  a Gmail issue.
15/11/2012
sale pr,sale rm,fully validated as sample and as sale
most profitable still uncomplete
top seller still uncomplete
transaction uncomplete
File::OpenTemp used incorrect filenames on Windows
Lacewing::File did not close FDs on destruction (Windows)
Fix Stream queueing issues
Add tools.Fixed WhiteList and BlackList.Fixed a bug in dnsfilter.
- Reset the page counter for techreports back to 3.
Added second task ,

Cumbersome, but works perfect !!1
Little later going to add some more comments.
Allow people with capitalization skills to give up
fix updated arduino
Merge branch 'experimental'
add a full page mode
Set the timezone when we load the time object, doh!
add png
impl some png decode
guessing finished
Fixed some memory leaks, thanks to some old TC commits.
Changed at 2012年 12月 17日 星期一 13:13:22 CST
modified function names to match given conventions, added constructor to intinfoset to extract it from a given parameter DenseVector, added parameter entry values to IntInfo and IntInfoSet classes, started implementation of options for branching algorithm
check_pkg_extra_files: Add info on how to fix problem
fix ssl check
update package ssh2
remove unused glade package
update http link for giflib
add dependencies to libglade ; update url for ocaml-camlimages ; add dependencies and some fixes for ocaml-lablgtk2
Merge remote-tracking branch 'upstream/master'
Complete whitelisting check
Add all my old code from iBoot-574.4's libc. Based on libsaio from the Darwin bootloader.
Added some documentation of classes and theirs members.
Merge branch 'documentation' into devel
Fix for BPS-147

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@131818 a5903396-d722-0410-b921-86c7d4935375
IMDB info in spot detail page
edited trait annotations
Implement global messaging
'Release: 2.1.0alpha1'
tweaked documents for multibit port module
added docdir for multibit port master
'Release: 2.1.0alpha2'
merge xpd.xml
bump version; handle file uploads
Deleted _posts/2012-07-24-new-twitter-bootstrap20.md
noCache parameter added with default value true
finished Time Integrators(part1)
convert: PEP8, changelog note and license
change replaygain plugin backend: it now invokes a command line tool (mp3gain or aacgain)
add apply_gain option (was default)
rgain: fix computation on singleton import
rgain: unclutter stdout
Added processor/thread detection, by default will now use maximum available processor count instead of 2. Idea adapted from soundconverter, credits in function.
Forgot to actually call the function
Made a simple update to the documentation
only load plugins from specified modules

Eliminate the __subclasses__ trick for finding all plugins. Now we explicitly
look in each plugin module for a plugin class. This allows us to import plugin
modules with unintentionally loading them. This lets us reuse the image
embedding machinery without copypasta.
convert: changelog thanks & doc enhancements
convert: low-level tweaks

Mainly adding some careful handling of paths (pass through displayable_path
before logging, etc.).
Merge pull request #55 from KraYmer/upstream

Adding threads to new ReplayGain backend based on command-line tool
replaygain: changelog & doc enhancements for GH-55
replaygain: fix aacgain waiting for user input by using -c switch to ignore clipping warnings
merge pull request #56 (thread count detection)
move cpu_count to util module; credit @storrgie
merge
fix "beet modify" for date fields (GC-449)

This is fixed by allowing MediaFiles to convert strings to integers on
assignment. An eventual complete fix will perform these type conversions in the
Item interface.
mbcollection: change chunk size to 200 releases
replaygain: Fix TypeError if command option is not set
Cleaned up functional tests and in some cases made them more stable
Merge pull request #479 from mridgway/arrow_travis

Cleaned up functional tests and in some cases made them more stable
Fix action-context tests
pulling changes from develop-perf
removed commented unused model
Merge pull request #527 from imalberto/fix-test1

Fix action-context tests
Correcciones de los modelos de CUR
Se termina de agregar las letras a las imagines e CUR
Se agregan imágenes faltantes en el commit b9ea65a
paper dobre desarrollo de aplicaciones con tecnologias J2EE
paper sobre tecnologias J2EE (commit anterior es sobre Arquitectura)
Fix typos in INSTALL-WIN32.md
Fix typos in driver.xml and erl_driver.xml
Fix typos in ct getting_started_chapter.xml
[eldap] Initial copy of Tobbe's eldap client

Copied with Torbjorns permission from https://github.com/etnt/eldap.git
[eldap] Add infrastructure
[eldap] Remove broken functionality

eldap_fsm is broken so we have decided not support that at the moment.
Which makes eldap_sup and eldap_app unused and thus they are removed to.
[eldap] Add dereference options in search

And fix search reply when no object is found
[eldap] Add asn.1 compilation options
Rename fin_per_testcase to end_per_testcase
Skip on buggy solaris
Increase test margin for user timetraps
Fix problem with wrong data_dir sent to hooks if init_per_* is missing
Add warnings_as_errors option
Up version
Use wx:wx_object() type now that it is exported
Report only actual unknown types otherwise no message is sent
Fix bug related with infinitely looping functions

Depending of the ordering of the functions during dataflow, a
function with an infinite loop might be identified as one that
always crashes. This is fixed now, by allowing restoration of
the infinitely-looping status.
Correct handling of INTEGER (1..4 | 8 | 10 | 20)
Merge branch 'sa/dialyzer-R15B01-last-minute-fixes' into maint

* sa/dialyzer-R15B01-last-minute-fixes:
  Fix bug related with infinitely looping functions
  Report only actual unknown types otherwise no message is sent
  Use wx:wx_object() type now that it is exported
  Up version
  Add warnings_as_errors option
Fix wakeup functionality in no thread support case
Add various examples, basic blocks of a library and REAL theorems
* t2_qs_pan.ncl: title fix
* ncl-mode.el: improved ncl-calculate-indent (not perfect)
RWTH 2012
fix the bug in the poller base
Merge branch 'master' of https://github.com/zeromq/netmq
some performance fix (message close method is doing nothing, remove the cloning of the byteArraySegment and use reset instead)

Rewrite the poller code with native methods instead of .net methods (which calling native) - performance improvement
fix the modified collection again with nicer solution and better performance friendly
back to original poller code
change the assembly info to reflect company name and contributers
Merge branch 'master' of https://github.com/somdoron/netmq
Merge pull request #31 from somdoron/master

fix collection was modified exception and performance improvement issue #30 and issue #26
2.2.0 changelog
update README for 2.2.0
update manifest with new top-level files
Merge pull request #202 from minrk/post220

Doc/readme changes from 2.2.0 release
node-gyp support. keep wscript for compatibility.
add comments in configure file
rename global variable server_state to serverState
split classes in SendString.t
Merge branch 'test' into develop
simple check/print
a bit tougher tests
starting to formulate where to move. comments for the plan of attack
removed eqresp
moved generators
new listing helper
new views generator
Commit 06.11. 03
is_activeがFalseになっているユーザーの認証を通さないように修正しました。
Removed Apache dependency by adding equanimity/rproxy_server.py.
Fixed "bugs" in web/battle.smd and equanimity/auth_server.py.
Updated equanimity/notes.txt to reflect changes.
Disabled pylint rule W0142 about not using * and ** calls
Pylint'd polygon module except for FIXME's
added result type defination.
added table module.
added testcase of table module.
testing with git config --global core.editor
In process of transferring to multiple renderers, currently trying to solve basic page swap which almost works. Investigate where and how EOS is changed.
Büro Kaşesini Veritabanına yükle..

Önceden büro kaşesi dosya olarak harddiskte tutuluyordu,
Program başka bürolara verildiğinde problem olacaktı, bu nedenle Buro
tablosuna gerekli alanlar açılarak veritabanına aktarıldı.. Raporlarda
gerekli değişiklikler yapıldı..
Some Bug Fixes

Müzekere basımında miktar alanının virgülden sonraki kısmı vb
Referans Dosyaları Local Tablolara alındı

Cinsiyet, Medenihali vb. gibi dosyalar local database'e alındı..
Uyap Dosya Hazırlama eklendi
Semiramis Windows Azure SQL Databasei kullanabilecek şekilde düzenlendi
add Test/Grab_DTS.py
Cleanup deschedule

Signed-off-by: Tony Z <xl2tp@mohnatka.ru>
Fix aschedule function.

Unfortunately nobody uses it.

Signed-off-by: Tony Z <xl2tp@mohnatka.ru>
Multi Slider
improved scan type transitions
display up/down votes
login socy
login socy
login socy
login socy
login socy
login socy
login socy
login socy
login socy
login socy
login socyi done
party c
upgrading flask
v0.59
v0.65
v0.69
avatar hight
infobox borders
draggable
draggable
ENH: Compiler fixes for ANTS, and ITKv4 compatibility

Turn on the ITKv4 compatibility for agressive compiler
failures when deprecated code is used.

git-svn-id: https://advants.svn.sourceforge.net/svnroot/advants/trunk@1431 fd2da0a4-d968-48df-9cb5-d8c496287cbf
10.22.12
[Bug 863915] Fix some typos in the app commands docs
Merge pull request #28 from BanzaiMan/dev/hasari/bz830307

Address BZ830307: suggest running 'rhc app create' when no application i...
Fix BZ830307: Look up defined OpenShift user name before prompting the user for it.
[MOD] Dictionary entry added
[MOD] XQuery: RESTXQ namespace added (prefix: restxq)
Merge branch 'release/2.2.3' into develop
clarified "no loader found" exception
bumped changelog for 2.2.4
Merge branch 'release/2.2.4'
fixed cagada
Update with @chc4 patch
email verification using devise
[0.5.6.149] Fix bug with Phobos struck.
hannahs commit
Updating a number of things in trying to get Texture loading to work. Also updated both Keyboard and Mouse input classes.
Add reload permission to plugin.yml
Do not crash when cloning HEAD-less repo

For a git repository HEAD reference is optional.
.clone() would crash at the attempt to update
target repo 'HEAD' reference if source repo is HEAD-less.
Merge pull request #25 from DDDamian/AE

Fix bad string conversion, revert to WAVEFORMATEXTENSIBLE, revert guiset...
Merge branch 'AE' of git://github.com/gnif/xbmc into AE

d m_fsize values"

This reverts commit 8f9bb7e36ba1d3fb88ee791c192cfd8b21aa8e9d.
[AE] added new CAEBuffer class

[AE][SoftAE] changed m_buffer in CSoftAE to use new CAEBuffer class
[AE][SoftAE] changed m_encodedBuffer to use CAEBuffer
[AE] fixed linux build
[AE] fixed linux build properly this time
[AE][SoftAE] updated SoftAE to use CAEBuffer
[AE][SoftAE] fixed CSoftAEStream crash when downmixing
[AE][SoftAE] renamed and changed m_frameBuffer over to CAEBuffer m_inputBuffer
Merge pull request #24 from huceke/AE-restart2

CoreAudio version of the AE engine...
removed never used deprecated MP1/2/3 passthrough options
[AE] removed more MP1/2/3 setting code and fixed OnSettingChanged callback not firing when output device changed
[AE][SoftAE] fixed stream slave not starting on drain
[AE][SoftAE] minor improvement of slave stream start
[PAP] fixed playback of streams with indeterminate length
[AE][SoftAE] fixed buffer size calls for draining streams, dont assume full buffers
[AE] changed IAE::MakeSound to pass name by ref instead of making a copy
[AE] more minor interface tweaks and cleanups
[AE] made engine constructors protected + befriended CAEFactory
[AE] refactored to use std::string instead of CStdString
Fixed update_all fails if nothing to update

For models containing only associations update_all was generating invalid SQL when editing object.
Added function up to aliasrc
Updated vim
Updated vim
Updated vim
Updated vim
Added comment for zftp
Updated Oh-My-ZSH
Updated Oh-My-ZSH
Updated vim
Updated vim
Updated vim
task update will pull submodules too
Updated oh-my-zsh
Updated vim
fixed update task
fixed update task
Updated oh-my-zsh
Updated oh-my-zsh
WIP: Fixing gravity digging.
change
Merge branch 'iss53'
added more sensible text
Code quality fixes
import clean
added serializers
minor code clean
moved parts of adapters that depend on resource to separate project. Now
we no longer need to ship the resource packages with Non-OSGi
distributions, as they are completely useless there
factored out interface of HTTPMap
Changes (upgraded pdfbox, added fontbox) for bundle dependencies
Storm-logo file updated
Gui aptvarkytas. Kur toggle buttonai, galima keisti registru reiksmes.
Amended fix for #63
Got the controllers working with the request handler executor
Got the tests page to work again
Got the auto register context convention working
Refactored the framework folders
Added methods to classification().
should return NA if NA is supplied.
methods for classification()
changed class
changed class
added ID argument, to choose between ncbi and tsn, when no class is supplied.
Merge pull request #21 from EDiLD/dev-classification

Dev classification
updated README with correct link to the taxize tutorial on the ropensci website
added function downstream2 and man file

Works for getting all families downstream from e.g., a class or order, need to generalize still
Redesigned background drawing, and added the option to draw a shadow texture.
no browser cache on api
Make it apparent where the modules are loaded from.
Use data/package.php for the packaging.

Now, both the core and modules use the same packaging mechanism.
Also, this updates the build environment so as to get proper packaging
(see buildenv/fix_package.php).
get_cabac_inline_x86: workaround clang bug with disabled optimizations

gcc produces binary identical output relative to before this change

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
smoothstreamingenc: Don't assume streams start from timestamp 0

Also use dts instead of pts for deciding where to split fragments.

Signed-off-by: Martin Storsjö <martin@martin.st>
configure: generalise 64-bit test

Signed-off-by: Mans Rullgard <mans@mansr.com>
configure: detect mips64 automatically

Signed-off-by: Mans Rullgard <mans@mansr.com>
configure: detect ppc64 automatically

Signed-off-by: Mans Rullgard <mans@mansr.com>
configure: detect parisc64 automatically

Signed-off-by: Mans Rullgard <mans@mansr.com>
avutil: Move memcpy_backptr() to mem.c

The function is used elsewhere and does not belong with the LZO code.
avutil: Make LZO decoder code configure-time selectable
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Make LZO decoder code configure-time selectable
  avutil: Move memcpy_backptr() to mem.c
  configure: detect parisc64 automatically
  configure: detect ppc64 automatically
  configure: detect mips64 automatically
  configure: generalise 64-bit test
  smoothstreamingenc: Don't assume streams start from timestamp 0

Conflicts:
	configure
	libavutil/Makefile
	libavutil/lzo.c
	libavutil/lzo.h
	libavutil/mem.c
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
mxfdec: allow container_ul to override codec_ul if codec is A-law

Fixes some DNXHD files generated by AVID TM, where codec UL was set to A-law
meanwhile the real audio codec was PCM S16. According to SMPTE RP 224, A-law is
the default value for sound essence parameters therefore we should handle it
specially.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
smush: check audio packet size

Fixes null pointer dereference.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
eamad: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
mjpegdec: reset h/v_count, fix assertion failure.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ac3dec: ensure get_buffer() gets a buffer for the correct number of channels

If there is an error during frame parsing, but AVCodecContext.channels was
changed and AC3DecodeContext.out_channels was set previously, the two may not
match.

Fixes CVE-2012-2802
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

CC: libav-stable@libav.org
smacker: read escape codes in single get_bits() call

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Remove some silly disabled code.
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
avformat: Convert some commented-out printf/av_log instances to av_dlog
avcodec: Drop some silly commented-out av_log() invocations
avcodec: Drop silly and/or broken printf debug output
avcodec: Convert some commented-out printf/av_log instances to av_dlog
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec: Convert some commented-out printf/av_log instances to av_dlog
  avcodec: Drop silly and/or broken printf debug output
  avcodec: Drop some silly commented-out av_log() invocations
  avformat: Convert some commented-out printf/av_log instances to av_dlog
  avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
  Remove some silly disabled code.
  ac3dec: ensure get_buffer() gets a buffer for the correct number of channels

Conflicts:
	libavcodec/dnxhddec.c
	libavcodec/ffv1.c
	libavcodec/h264.c
	libavcodec/h264_parser.c
	libavcodec/mjpegdec.c
	libavcodec/motion_est_template.c
	libavcodec/mpegaudiodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/put_bits.h
	libavcodec/ratecontrol.c
	libavcodec/wmaenc.c
	libavdevice/timefilter.c
	libavformat/asfdec.c
	libavformat/avidec.c
	libavformat/avienc.c
	libavformat/flvenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avrndec: add DR1 capability flag

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
h264: Workaround invalid MPEG-TS broadcasts

Fixes seeking to the first keyframe
Fixes Ticket1029

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
swr: audioconvert: consider mono to be planar

This way it will be handled by the planar==planar SIMD

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
swr-x86-simd: add ff_unpack_2ch_int16_to_int16/int32/float_a_ssse3

more than 10% faster (tested on sandybridge)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
codestyle for admin table classes
date element select - now consistent in firing Fabrik and window events whether closed from the date or time picker
Merge branch 'master' of github.com:Fabrik/fabrik
User element needs to set default join key to 'id' in getParams() when
creating new element.  Fixes #201
updated indentation for meta banner in grunt and adding return value for $.noConflict in the docs.
README's geaendert
A
B
Added __init__.py files so we can import from our directory structure as sub-modules
Syntax errors in evaluate_team
Changement du README pour respecter GitHub
Implemented Player and Camera
Removed a few Options
Implemented Options
Add druid mana bar, and fix bugs.
Distance field display work corectly (generation is slow but it work)
minor fix
return user info in vCard
updated the doc...
trying configurations with real-life data and plugin
Highlighting the current point. Some other fixes
throw exceptions instead of msgboxes
add native support for SQLite 64bit. Fixed SQLite_L interface using correct Ptr* to allow 64bit. Added native 64bit dll for SQLite.
Moved ToSqlLiteral(value) into abstract base class
fixed insert-many in SQLite. improved ShowCase Script with better Exception handling.
Server ist jetzt auch Client. Spiel startet im Netzwerk und ist spielbar zmndst. 2 Player mode. Anderes noch nicht getestet. Diverse setter und getter Methoden in der Logic hinzugefügt wegen des KI codes.
fixes #77 bu removing exmplicit jQuery support
Merge pull request #120 from Jakobo/issue_113

Fixes for #113, Update to lscache
Merge pull request #119 from Jakobo/issue_77

fixes #77 bug removing explicit jQuery support
For require.ensure(), added check to see if moduleList is an Array.  Unit tests are included as well.
Transfer of Copyright to LinkedIn
Merge pull request #121 from ryanone/master

Fixes #117 For require.ensure, added check to see if moduleList is an Array.  An exception is thrown if it isn't an Array.
Merge remote-tracking branch 'linkedin/master' into issue_113
Updates #117 with test refinement. Removed async tests where not needed, and used raises() directly
fix bug of processing language in universality
Fix bug of processing language in muniversality
Merge pull request #36 from cousquer/UP-3454

UP-3454 Fix the bug of the processing language in xsl
added tvdb_ruby gem in projects
revert init & dispose in IdeaInitDescriptor
add custom plugin
fix structure
Removed prefix from ModelRoot concept and RootReference
Merge branch 'ilya' into master3
Correct some type in NEWS
Adjust the splitter to not waste space on the accessor selector.
Add some more locale accessors.
Add a search line for the locale table.
before rails 1.0
Rails 1.2.6 ready
Updated to rails 2.0
Upgraded to rails 2.3
.gitignore
gitignore update
New README
Fixed errors in help command, description of log2. Added date and version to actions.py.
Advice user to set up stripping trailing white space in editor

Test Plan: Triggered it.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T2022

Differential Revision: https://secure.phabricator.com/D3864
Fix copy/paste error in comment
modify arc diff workflow to only do amend optimization if git repository

Summary: fix for T2011, first option in list of possible fixes

Test Plan: ...do I really have to setup mercurial with mq? :D

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Maniphest Tasks: T2011

Differential Revision: https://secure.phabricator.com/D3869
Merge branch 'master' of http://github.com/facebook/arcanist
CMake Nightly Date Stamp
Merge topic 'CPackRPM-emptyPerComponentREQUIRES'

7321c94 CPackRPM: avoid leakage of RPM directive from one component to another.
Merge topic 'FindPythonLibs-13216'

9d145b0 FindPythonLibs: honor EXACT version specification (#13216)
Merge topic 'FindBZip2-GnuWin32-registry'

7c912af FindBZip2: Search locations in GnuWin32 registry
Merge topic 'KWSys-hashtable-old-gcc'

4f170e2 KWSys: Fix hashtable prime list on g++ 2.9 (#13273)
Merge topic 'archive-exclude-file-flags'

a34015d cmArchiveWrite: Clear fflags from archive entries
Merge topic 'makefile-escape-equals'

ee6c1b8 Makefile: Support directory names containing '=' (#12934)
Merge topic 'VS-Fortran-Intel-2013'

8945489 VS: Set Intel Fortran 13 project version
Merge topic 'libarchive-sun'

54ffb5b libarchive: Avoid 'inline' on SunPro < 5.9 (#13277)
Merge topic 'no-std-stringstream'

94de982 Avoid direct use of std::(o|)stringstream (#13272)
Merge topic 'update-KWIML'

0dfdde1 Merge branch 'upstream-kwiml' into update-KWIML
6240f85 KWIML: Report broken integer format macros on AIX 4.3
e1b0fc9 KWIML: Add interface to report broken integer format macros
Merge topic 'UseJava-13281'

5593d57 UseJava: fix find_jar() called with multiple files (#13281)
Merge topic 'position-independent-targets'

bd34963 Refactor generation of shared library flags
55d7aa4 Add platform variable for flags specific to shared libraries
31d7a0f Add platform variables for position independent code flags
Merge topic 'object-library-is-not-shared'

9a9b3e4 add_library: Allow OBJECT library without dynamic linking (#13289)
Merge branch 'master' into next
ExternalProjectUpdateTest: Only support Git 1.6.5 and greater.
Merge topic 'only-git-fetch-when-necessary' into next

0fc55e2 ExternalProjectUpdateTest: Only support Git 1.6.5 and greater.
FindOpenSceneGraph: simplify by using more features of FPHSA
Merge topic 'openscenegraph-simplify-fphsa' into next

248db6c FindOpenSceneGraph: simplify by using more features of FPHSA
CMake Nightly Date Stamp
CMake Nightly Date Stamp
Intel: On Windows use /EHsc instead of deprecated /GX (#13163)

Use of the deprecated option with Intel 2011 produces

 icl: command line remark #10010: option '/GX' is deprecated and will
 be removed in a future release. See '/help deprecated'

so use its replacement option which has been supported for several
older versions anyway.
Merge branch 'master' into next
Merge topic 'intel-Windows-EHsc' into next

4f80896 Intel: On Windows use /EHsc instead of deprecated /GX (#13163)
Ändrat metoden popCard i Deck
Work in progress multimaps, ENG_MSG updated
Update ToDo for translation with new Ulli's MSG
Rename MSM_RADAR to MSM_MAPRADAR being multimapped
Add MultiMap Test page for TESTBENCH mode, needed to check events and experimenting
DrawMultimap_Test.cpp is like the Example source code
New EVENT_TOPLEFT and EVENT_TOPRIGHT in Multimaps
Do not allow changing multimap in pan mode
Fix bug in DrawMultimap_Radar DoInit resetting MAP_ASP flag instead
Fix multimap problem not updating topology cache after changing zoom to low levels in asp page
Probably it is possible to fix it directly in multiasp, but this is the same approach used for oracle, so it is ok as well.
(CC) dlgConfiguration no need to use "changed", since we use new profiles since long ago.
Fix TrueWind IAS configuration and Max Speed in aircraft configuration, not keeping some values.
stub to be filled, now just take libpng and code!
Memory leak fix i guess? Crashing on linux but keep running on windows, must push to test.
Don't use timezone data when constructing the day to retrieve CDRs
Update SpeakUp type mapping
Zero renderer::numDirLights
Set surface/atmosphere uniforms in geospherematerial instead of GeoSphere.cpp
Create atmosphere shader during CreateMaterial
Create surface material properly
Thruster sliders
Add po.vim ftplugin
configure: pass --external-ffmpeg down to pvr-addons, if enabled,
when building them intree
Added: [Confluence] a popup dialog that gets shown once and only once on first run of XBMC when they enter a window with the side menu to inform people there is a semi hidden menu off to the left hand side of the screen
fix sets directory node after d2455c3f64d583cc065362162f784da63bd0e38d - don't display 1-movie sets.
move deleting gl textures to TextureManager, fixes asic hang on AMD
[ARM/ffmpeg] - fix overreads in neon h264 chroma mc - fixes #13283 - thx to Mans Rullgard from team libav for taking the time for looking into it and throwing out a patch in zero time :o)
[ffmpeg] - patch file for "ARM: fix overreads in neon h264 chroma mc"
jsonrpc: fix JSON schema for PVR.Details.Channel
jsonrpc: improve JSON schema for XBMC.GetInfoLabels/GetInfoBooleans
fix sets directory node after d2455c3f64d583cc065362162f784da63bd0e38d - don't display 1-movie sets. (reverse-merged from commit 1d4ebecabd84101ec20785f93fc68a925e67ba92)
partymode: properly handle musicvideo playlists as video (fixes #13423)
jsonrpc: fix JSON schema of the return value of GUI.ShowNotification
make sure to force resorting after an item list refresh otherwise cached order is used
[rendering] fixed split resolution in view mode setting and fix display zoom mode

When the GUI height is 720 and the Display height is 1080 we would set the zoom amount to 1.5. So we have to apply the split resolution scaling factor before we do the calculation.
reverting because part of PR 1646: make sure to force resorting after an item list refresh otherwise cached order is used (reverse-merged from commit 8fcf730a01b66e07f914fecd5238eb2aaeb562cb)
[lang] mark weather tokens in English strings.po file
[lang] fixed: weather token intervals
[lang] added missing weather tokens to English strings.po file
[lang] fixed: missing semicolon in English plural form
Merge pull request #1649 from FernetMenta/asic

fix gfx freeze on AMD (Linux) - Asic hang

The special code for GL should probably be factored out else where. But it make sense to postpone deletion of textures that are queued for render in next flip to after the actual flip call.
gui: always hide seek dialog when player signals display after seek

This fixes stuck seek bar with paplayer
Nastavovanie
isdiagonal
sqrtm with transitionnal trans
adapt maximum allowed ulp in fft test when FMA4 is used
ulp fixes for 32-bit x86
fix case in NT2_ARCH arm case
Fixed blkdiag out of bound accesses
Move type_id, demangle and display_type to sdk/meta. Fix issue #194
Fixed bug in disp(string_litteral) due to too broad specialisation.
commenting out invalid tofloat call in nbtrue
max add first comit
опять паддинги в правом навменю
Passed collisionTest
specifiy node version for heroku
add hipchat backend
fix package json
remove hipchat
add hubot
update hubot
update hubot
asdf
add hubot-scripts
(hw2P2, tb) Apply value changes.
(hw2P2, tb) Re-arrange testbench.
Tablet-Scrolling.md 移出 draft
20120904 定期 commit
added Jocopa3's IntArrayTag additions, with one bugfix
Static Query<T> now also support .Strict()
libmythservicecontracts needs to link libmythbase following [f2dd6f9e]
Don't store the last used DVD device

This prevents users with multiple drives from using the second one at
a later time. There's no good reason to force the use of only one drive.
Fix Mac OS X media monitor error.

Starting up frontend with removable drives mounted would do:
2012-03-16 21:07:25.878756 E  MythMediaDevice::performMountCmd(true) - Logic Error? Device already mounted.
This adds a platform #ifdef to work around convoluted logic.
Better long-term fix would be to make onDeviceMounted() unprotected.
VERTX_MODS wasn't recognized in Windows
Tradotte parti più importanti
Correti alcuni arrori
Tradotto in parte.
tradotto
Merge pull request #734 from Matta95/patch-40

tradotto
automessage
another formatting change
.db3
Add rudimentary sound manager
fix memory leakage bug
autobuild fix + sl skeleton
Full accelerometer and compass classes for iOS. Consider moving everything but the accelerometer and compass classes to the non platform specific area and include those in other projects.
Updating doxygen to 1.8.1. It fixes some parsing issues in 1.8.0.


svn path=/nixpkgs/trunk/; revision=34496
haskell-async: updated to version 2.0.0.0

svn path=/nixpkgs/trunk/; revision=34497
haskell-ghc-mod: updated to version 1.10.18

svn path=/nixpkgs/trunk/; revision=34498
* Clean up the Ant name, e.g. "ant-openjdk-1.8.0RC1" instead of
  "ant-<JDK name>".
* Remove openjdkDarwin/ecjDarwin/antDarwin attributes.  Instead
  the openjdk attribute refers to the Darwin package on Darwin.

svn path=/nixpkgs/trunk/; revision=34505
Update dblatex to 0.3.4
iptables: upgrade to 1.4.16.2
linux kernels: mark kernels with rpfilter support
linux kernels: mark kernels that can disable the conntrack-helper
linux-3.6: upgrade to 3.6.2
linux-3.5: upgrade to 3.5.7
linux-3.4: upgrade to 3.4.14
linux-3.0: upgrade to 3.0.46
Updated player data communication: added name.
Updated Config file for windows.
Add a --yes option to always answer yes to OPAM questions
collisions corn/bird
fix til AA validering
roller til file entity
rettet AA fejl med 2 slags links i selvbetjeningslinks, selvom det var links til samme sted
updates to meetings
Reformat HTML structure
Update Twitter Bootstrap to version 2.2.1
Update jQuery
Use minimised versions of JS libraries
Added a different highlight for the spacebar
Numerous bug fixes and minor improvements.
Add numbers to xen_shm_state_t
Fix iotcl (unlocked_ioctl since 2.6.26)
Struct definition typos
Fix includes
Typo, return 0 at the end of int functions
module_param only accept certain types by default:

/**
 * module_param - typesafe helper for a module/cmdline parameter
 * @value: the variable to alter, and exposed parameter name.
 * @type: the type of the parameter
 * @perm: visibility in sysfs.
 *
 * @value becomes the module parameter, or (prefixed by KBUILD_MODNAME
 * and a ".") the kernel commandline parameter.  Note that - is changed
 * to _, so the user can use "foo-bar=1" even for variable "foo_bar".

 * @perm is 0 if the the variable is not to appear in sysfs, or 0444
 * for world-readable, 0644 for root-writable, etc.  Note that if it
 * is writable, you may need to use kparam_block_sysfs_write() around
 * accesses (esp. charp, which can be kfreed when it changes).
 *
 * The @type is simply pasted to refer to a param_ops_##type and a
 * param_check_##type: for convenience many standard types are provided
 * but you can create your own by defining those variables.
 *
 * Standard types are:
 *      byte, short, ushort, int, uint, long, ulong
 *      charp: a character pointer
 *      bool: a bool, values 0/1, y/n, Y/N.
 *      invbool: the above, only sense-reversed (N = true).
 */
Define local variables outside the switch
__*_user use pointer/pointer and non pointer/long
finalisation fcts de rotationsgit add .à tester
fonctions thread codées
Map, Fuel check
Merge branch 'master' of git@github.com:PPilger/OOP-8.git
Implement let as macro.

"Macro" interface was really the interface for "FExpression" as
it had access to the current environment.

Turns out we can't implement "quote" as a macro - that was just a bug
in that we weren't expanding macros properly.
laget appointmentListToXML og XMLToAppointmentList
Merge branch 'master' of https://follan@github.com/Proj11/Proj11.git
Small update to UI
Change mrdeveloper url for slickgrid
added entry
Added Big Bird.
Mark's first commit
Merge pull request #7 from Qalthos/master

Added Remy's totally not made up information
Merge branch 'master' of github.com:FOSSRIT/posse
Merge branch 'master' of git://github.com/mwambach/posse

Conflicts:
	data/students.yaml
Merge branch 'master' of git://github.com/ralphbean/posse

Conflicts:
	data/students.yaml
Merge branch 'master' of git://github.com/bksteele57/posse

Conflicts:
	data/students.yaml
removed obj bin folders
Se actualiza el README
Merge branch 'develop' into feature/html5
some pet stuff
some other stuff from mangosR2 like

GetPlayer()->SendMeleeAttackStop(pEnemy)
rewrite PetAI
 -> TargetMovementGenerator
Cleanup
Merge branch 'master' of https://github.com/Rovak/KJExtJS
#6, Direct Task Api Caching
Merge branch 'master' into feature/cache-direct
deleted Pkg
Added hover graphics to boxes. Still need to work out weird alignment issue
i finally got this how i want
Add generic tree - xtree - to libcommon

Signed-off-by: Matthieu Hautreux <matthieu.hautreux@cea.fr>
Add uthash header and license to src/common, needed for xhash

Signed-off-by: Matthieu Hautreux <matthieu.hautreux@cea.fr>
Update copyright and Makefile for new uthash logic
Add generic hash table - xhash - to libcommon (currently a wrapper around uthash)

Signed-off-by: Matthieu Hautreux <matthieu.hautreux@cea.fr>
add CHECK lib checking and configuration in build suite

Signed-off-by: Matthieu Hautreux <matthieu.hautreux@cea.fr>
add xtree-test unit tests to slurm testsuite

Signed-off-by: Matthieu Hautreux <matthieu.hautreux@cea.fr>
add xhash-test unit tests to slurm testsuite

Signed-off-by: Matthieu Hautreux <matthieu.hautreux@cea.fr>
Results of running autogen.sh after CEA patches
Format changes in new CEA code, no change in logic
Include full paths from deja gnu tests to src/common header files
In configure macro, add logic to capture function return code, avoiding warning
For DejaGnu test, add HWLOC header and libraries needed for build
Add DejaGnu (make check) README, minor change to Makefiles
Add François Chevallier to Slurm team web page
Add CEA copyright notices to new work
Merge branch 'cea_xhash_xtree'
build_and_run: use exec
dpsop: include album in default track format
awesome: don't cut a string in the middle of a UTF-8 character
added type to required field error
mvoed Exceptions to their own files. remove require
Merge pull request #85 from stanistan/master

Updates
Update egg versions in slaprunner
Pin versions
Use version of pyXML that is downloadable/cached
klan project
Rendering happens in templateCompiler, changed creation of child components
added the functions that deal with winning and losing
Merge branch 'master' of github.com:SoobNauce/CWE
commiting to merge
Conflicts:
	res/imports/CWE_map.py
	res/imports/CWE_terrain.py
[wip] further generalisation of estimator by introduction of residual methods in pde
rename: _post ==> _posts
Убрано поле "До метро", исправлен текст объявления с "4-комн.  квартира,  Интернациональная ул,  10, 4/8, площадь:  общая 400 кв. м., приватизированная" на "в ЛК ИП объявление с названием "4-комн. квартира, Интернациональная улица, 10, 4/8 общая 400 кв. м., приватизированная"
добавлен cucumber_rerun.json
guoyongibn作业
Merge pull request #9 from guoyongbin/master

guoyongbin作业
TDTR
revert conflict
better log; use gevent.pool.map to do map
produit de Kronecker sans gradient
Split op and test classes, improve description of out_var in make_node.
Merge pull request #701 from larseeri/kron

Kron
Bringing it up to date after clone
CoverFlow
showtrip
delete unused part
showtrip_scrollbar.ai
remove ai file
remove image src file
Merge branch 'master' of github.com:Timego/timego
새로올림
fix client to properly enumerate yum repos
Done posts
mobile login page v3
getting mobile layout to work
Edit comment functionality and checking.
enforce active window when mainwindow gets activated; should fix a problem where windows created when kvirc was minimized/hidden appears not-maximized on top of the others

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6127 17fca916-40b9-46aa-a4ea-0a15b648b75c
removed unused var, thanks gcc 4.7

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6128 17fca916-40b9-46aa-a4ea-0a15b648b75c
single bugfix in webview object + a lot of make gcc happy

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6129 17fca916-40b9-46aa-a4ea-0a15b648b75c
system.runcmd: added gnome-terminal to the list of terminals, added proper handling for osx Terminal.app

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6130 17fca916-40b9-46aa-a4ea-0a15b648b75c
Merge remote branch 'origin/master' into voltcore-integration

Conflicts:
	tests/frontend/org/voltdb/compiler/TestMilestoneOneCompile.java
        (Doesn't exist in voltcore, deleted it)
Add multi-part pass through ad hoc query tests.
Don't use interrupt() to shutdown an iv2 site.
ENG-3915 Fix voltadmin save parameters to properly quote the path and nonce.
Whoops, forgot these for TestUndoSuite.
Checkpoint partial 'disable the old path when IV2 is enabled' progress
- Need the HeartbeatThread (for now) in order to make adhoc queries
  run.  Cut off the heartbeat messages in ClientInterface instead.
The old execution path no longer needs to know about IV2 Initiators.
Put all this stuff under the !isIV2Enabled() umbrella and hope for the
best!
Try to avoid first-pass inifinite regress on fault resolution.
Checkpoint IV2 command line switch progress
When IV2 is enabled, don't sweat topo changes based on SiteTracker
changes.
Can't have TOPO stats without IV2, Flanders.
Add missing include for regular jar as well.
bugfix boolean comparison
镜像站文件大小单位计算
Another partial commit.
More changes. Improves styles.
Changes API.
Compress images.

The decrease is 32KB in total.
remove form_type radio_br & checkbox_br
Merge branch 'pref_form' into CorePack
CorePack version `CorePack 20121230`
paired program session: test_run_BLAST, etc.
Added demo pic in Readme
simplified dirs
Downloadable hyperlinks are now underlined.
Title of the publication is now marked as safe to allow sub and sup
tags.
Merge branch 'master' of github.com:Zelvuska/fuuk
added option function to readme
Remake reference adding in Event process
Merge pull request #390 from aabes/0c588a065c7a61272fc21ec71c6ddfe2028f0877

futz with pull req - get the right bits from ubuntu-12.04-extra [1/3]
Merge branch 'release/essex-hack/master' into release/essex-hack/openstack-os-build
Add updated submodule references for master
Merge branch 'master' into openstack-os-build
Merge pull request #271 from aabes/7fde79a73929e2d1ea900485d5ab6eb3bfb2e0bf

Fix nagios test for enabling hw monitoring to depend on barclamp presence [2/5]
Merge pull request #273 from aabes/2239465214c868192ddfc72a8a9ce9bf07974191

Fix nagios test for enabling hw monitoring to depend on barclamp presence [4/5]
 pull in bios changes for storage
Merge branch 'openstack-os-build' into openstack-build
Merge branch 'master' into openstack-os-build
Merge branch 'master' into openstack-os-build
Merge branch 'openstack-os-build' into openstack-build
Merge remote-tracking branch 'dell/openstack-build' into openstack-build
Merge remote-tracking branch 'dell/openstack-os-build' into openstack-os-build
Merge branch 'openstack-os-build' into openstack-build
BIOS/IPMI/NETWORK updates

IPMI Changes:
* Don't use crowbar user for now.  Use root until iDRAC and PEC issues are resolved
* Add setting dedicated mode for PER to ipmi code path
* Add discover role to get ipmi settings and write them on the wall (DE193)

Deployer Changes:
* Use the ipmi wall settings to suggest to the network barclamp (no toggle) (DE193)

Network Changes:
* Allocate IP can take a suggestion for the IP to allocate (DE193)
* Added deallocate_ip and disable_interface as REST API routines (DE175)
* Update the network barclamp to watch for delete and remove nodes (DE175)

Provisioner Changes:
* Add temp state delete-final that allows for bc's to search before actual delete
  (DE669 and DE667)
* Fix latent delete bug that wasn't deleting the node role.

DE672 was reviewed and already implemented.
Merge branch 'openstack-os-build' into openstack-build
Merge branch 'master' into openstack-os-build
Add code for WSMAN support for BIOS that mostly works.  Still has
an occasional loss of connectivity to server.

Also updated files.
Merge pull request #275 from galthaus/b4c15d4dd20c08c31959a6cbc9d57b6d26b81de7

Many defects and IPMI/BIOS/Network work [5/8]
Merge pull request #277 from galthaus/2e9c94d8af01eecf92637d382cf42241951dc82c

Many defects and IPMI/BIOS/Network work [7/8]
Merge branch 'openstack-os-build' into openstack-build
Merge branch 'master' into openstack-os-build
added equipment models
Fixes the b and h commands near placeholder text.

The <# placeholder #> areas are invalid for cursor placement but they were not handled correctly for the b and h. The cursor movement would just stop at the end of the placeholder and not go backwards.
Fixed search paths

Project uses $(DEVELOPER_DIR) environment variable for header search paths.
More project organization
Fixed OS X base SDK setting.
Implemented "sort" command
Merge branch 'master' of github.com:zanneth/XVim into sort
fixes the b command to use built in functions.

Placeholder discovery is not handled by rangeOfPlaceholderFromCharacterIndex: function native to the DVTCompletingTextView class. Added a function to return an array of all the placeholders in the given line. 
removed the manual way to determine if the current position held a placeholder. 
Adds home, end, page-up and page-down commands

home = first character in a line movement(Num0:)
end = last character in a line movement(Dollar:)
page up = page up. (C_f:)
page down = page down. (C_b:)

fixes #54
Merge pull request #302 from weaksauce/Home-End-Pageup-Pagedown

Adds home, end, page-up and page-down commands
Merge pull request #300 from weaksauce/fixbandh

Fixbandh
Merge pull request #298 from zanneth/master

Organized Xcode project for compatibility and neatness
Merge pull request #299 from zanneth/sort

Implemented "sort" command
Merge branch 'refs/heads/Shuichiro'
fix a return value error