labofsahil/github-event-dataset-2012 huggingface dataset:
Default watchdog time to 5 minutes
do more sanitizing of section ids
685afbc386379461641f6bb5cb10729b32d85f96의 커밋 오류 수정

stdafx.h 헤더의 내용을 소스 파일 내로 다시 복사
IDE Idea configuration files added into .gitignore
User can add email account
google Analitcs Implemented #16
Make camnode (cpp) to be more ROS like

Use rosparams, private namespaces, etc
prep for 0.3.3
Add Fx12 support to RC and WD
Merge pull request #52 from zacc/add_fx12

Add fx12
Test only change / possible fix for Bug 759639 - Intermittent test_0202_app_launch_apply_update_dirlocked_svc.js | test failed (with xpcshell return code: 0), | pending-service == pending, | exception thrown from do_timeout callback: 2147500036. r=bbondy, a=test-only
Partial fix (all but test_0201_app_launch_apply_update_svc.js) for - Bug 762032 - Intermittent test_0201_app_launch_apply_update.js, test_0201_app_launch_apply_update_svc.js test_0203_app_launch_apply_update_svc.js | WindowsError: [Error 13] The process cannot access the file because it is being used by another process: '...helper.exe'. r=bbondy, a=test-only
Bug 772210 - Fix warning: unused variable 'initFlushCount'. r=luke
Backout 39fe6a5577d7, bustage
Backout b53e8a614a4c, bustage
Backout 038e89521330, bustage
Backout 431ab4d097c9, bustage
bug 673487 - map from an original source to a generated; r=robcee
merge m-c to fx-team
Bug 789102 - Split browser_586068-cascaded_restore.js into multiple tests; r=felipe
Bug 794804 - part 1 - minimize chrome/worker communication when expiring thumbnails; r=yoric
Bug 794804 - part 2 - add tests for thumbnails expiration; r=yoric
Bug 792925 - Dynamically-added tab-scoped actors should get a reference to their parent; r=msucan
Bug 768096 - Web Console remote debugging protocol support - Part 1: page errors; r=past,robcee

--HG--
rename : browser/devtools/webconsole/WebConsoleUtils.jsm => toolkit/devtools/webconsole/WebConsoleUtils.jsm
Bug 768096 - Web Console remote debugging protocol support - Part 2: window.console API and JS evaluation; r=past,robcee
Bug 768096 - Web Console remote debugging protocol support - Part 3: network logging; r=past,robcee

--HG--
rename : browser/devtools/webconsole/NetworkHelper.jsm => toolkit/devtools/webconsole/NetworkHelper.jsm
Bug 768096 - Web Console remote debugging protocol support - Part 4: cleanups; r=robcee
Bug 768096 - Web Console remote debugging protocol support - Part 5: tests; r=robcee
Bug 762966 - reset homepage pref for users who have it set to google.com/firefox r=dao
Backed out changeset 89ab8685729d (bug 768096)
Backed out changeset 9c70da27ec28 (bug 768096)
Backed out changeset 8c127abc3ad8 (bug 768096)

--HG--
rename : toolkit/devtools/webconsole/NetworkHelper.jsm => browser/devtools/webconsole/NetworkHelper.jsm
Backed out changeset 57755fd703c9 (bug 768096)
Backed out changeset fd6633f5666e (bug 768096)

--HG--
rename : toolkit/devtools/webconsole/WebConsoleUtils.jsm => browser/devtools/webconsole/WebConsoleUtils.jsm
Backed out changeset 4a87ede182ca (bug 792925)
merge m-c to fx-team
Bug 795100 - Add a --gecko-path argument to the B2G mochitest testrunner, r=ahal, DONTBUILD(NPOTB)
Bug 810705 - Disable test_MochiKit-DOM-Safari.html on Linux because of PGO non-profiling crashes; r=ehsan, a=test-only
Bug 801345 - Give MessageReplyDeserializer a virtual dtor since we delete the base class pointer; r=cjones
Bug 801344 - Make sure that JSRuntime::initSelfHosting never returns an uninitialized value; r=till
Bug 794599 - Add a preference to disable logging. r=bzbarsky
Bug 808469 - Make gfxSharedImageSurface take a template parameter for the base surface type. r=cjones

--HG--
rename : gfx/thebes/gfxSharedImageSurface.cpp => gfx/thebes/gfxBaseSharedMemorySurface.cpp
rename : gfx/thebes/gfxSharedImageSurface.h => gfx/thebes/gfxBaseSharedMemorySurface.h
Bug 808469 - Use gfxQuartzSurface for OMTC drawing on mac. r=cjones
Bug 805948 - Use the local perspective value instead of trying to retrieve it from the nsStyleDisplay again. r=cjones
Bug 809006 - B2G Network Manager: Unable to set default route and DNS when required system properties not available. r=vicamo
Bug 509052: Add new, faster blurring code. r=derf
Bug 794599 - Backout 847cedab81ae due to debug orange
Bug 779997 - Import SoundTouch Library in the tree. r=
Backed out changeset 98f9d1044e54 because r= bit is missing in commit message.
Bug 779997 - Import SoundTouch Library in the tree. r=khuey,rstrong
Bug 779971 - Make nsSVGTextPathProperty::DoUpdate trigger nsSVGTextFrame::NotifyGlyphMetricsChange() off an asynchronous change hint (to avoid calling nsLayoutUtils::FrameNeedsReflow synchronously under nsISVGChildFrame::ReflowSVG or during frame teardown, and avoid infinite loops caused by using an event queue event). r=jwatt.
Backout e89f1fce980d (bug 509052) for an assortment of timeouts and crashes
Bug 802073 - Receive input event twice from input tag type:time and type:date r=vingtetun a=blocking-basecamp
Backout 99a2125bd365 (bug 779971) for reftest failures
Bug 800498 - Check for null context in MainWindowHook. r=jmathies
Bug 803782: Reset found flag before enumerating audio devices; r=jesup
Bug 808003 - Refactor the code to add telemetry probes in browser.js. r=gcp
Bug 808003 - Add a few telemetry probes to help tune tab zombification parameters. r=gcp, mfinkle
Bug 809328 - Stop using nsChangeHint_UpdateEffects in nsSVGRenderingObserver::DoUpdate overrides. r=roc.

--HG--
extra : rebase_source : 79d032ea6ad6275882ab675004d2e02b932d56d5
Bug 808003 - Follow-up for 4f5f601bc741; update the range on the FENNEC_TAB_ZOMBIFIED histogram as well. r=gcp
Backout 512b664f8092 (bug 788105) due to robocop orange.
Backout changeset 4e1480ab5116, changeset 576f7d52de4b, and changeset 2a030d4733a0 (bug 773102) because of test failure
Merge backout
bug 792442 - extend the dns cache grace period r=josh
Bug 780549 part 2 - Check returned value of AutoEnterCompilation::init in Ion compilation. r=bhackett a=abillings
Bug 720396 - Fix Debugger.addDebuggee with Debuger.prototype. r=jorendorff
Bug 764346 - Let Error Console filter match more properties like source, line. r=jaws
Bug 766120 - Stop conflating effects offset and continuation union size in nsSVGIntegrationUtils. r=longsonr.
Bug 721084 - Don't move profile to sdcard when Fennec moves there. r=blassey a=blocking-fennec
Bug 745567: Integrate bug 702284 and bug 728737 patches, r=mbrubeck a=xul-only
Bug 746429 - Make failure to set master volume non-fatal to startup, r=cjones a=b2g-only
Bug 745757 - Simplify CSS selectors involving the navigation toolbar and the tabsontop attribute. r=felipe a=desktop-only
Bug 711618 - Add ability to remember plugin activation settings. r=felipe a=blassey
Bug 711618 - Platform changes for click-to-play permissions. r=josh a=blassey
Bug 711618 - Automated tests for plugin activation permissions. r=felipe a=blassey
Bug 742619 - Intermittent orange in browser_pluginnotifications.js at test 11c. r=felipe a=desktop-only
bug 745699 - canvas2d rendering context needs to call gfxFontGroup::UpdateFontList() before MakeTextRun() to ensure user font generation is up to date. r=roc a=blassey
Bug 746548 - Fix NPE for cache service in pause/resume. r=mfinkle a=blocking-fennec
Merge mozilla-central and mozilla-inbound; a=me
Bug 686203 - nsHTMLEditorEventListener's MouseDown listener should disregard events outwith its editor. Also fixes bug 578771. r=ehsan a=blassey
Bug 746344 - gfxImageSurface should allow allocation without memset. r=jmuizelaar a=jpr

--HG--
extra : rebase_source : 271a72ec7911299d2a185df7c5139c00997e55df
Bug 738676 - Pairing multiple devices. r=rnewman a=blocking-fennec
Bug 746728 - Add sensor index fallback for qemu, r=gal a=b2g-only
bug 738501: Add `setShortcut` function to nsILocalFileWin. r=bsmedberg. a=gavin.

  The `setShortcut` function allows us to create or update Windows shortcut (.lnk) files.  The usage pattern is like so:
  Create an nsILocalFileWin whose path is something.lnk
  Call its `setShortcut` function to set the shortcut properties
Bug 738501. follow-up, rev uuid. rs,a=gavin
Bug 745995. Natively-installed webapps should yse the app's icon for their taskbar and system menu icons. r=bsmedberg a=gavin
Bug 731541. Implement webapp installer for Windows. r=bbondy a=blassey
Bug 422540 - GStreamer backend for audio/video decoding. r=cdouble, a=npotb
Backed out changeset f4467b37dfef for test failures. a=testfailure
Bug 770597: Short url in AwesomeScreen. [r=mfinkle]
Bug 769824: Styles aren't applied to AwesomeScreen lists. [r=mfinkle]
Bug 769388: Find in page overlaps content. [r=margaret]
Bug 770886: Height of search suggestions. [r=mfinkle]
Bug 760223: New menu icons for Find in page and Request desktop site. [r=mfinkle]
Bug 767596 - Log less potentially PII from Android Sync to the Android log, and log less overall at Log.INFO level. r=liuche

--HG--
extra : rebase_source : 5eb585c7ba5c77a248ffc5c073e1964bd2f823da
Backout a97741bbd972 (bug 755604) for compilation failures
Automated checkin: version bump for thunderbird 17.0 release. DONTBUILD CLOSED TREE a=release

--HG--
branch : GECKO170_2012111612_RELBRANCH
Added THUNDERBIRD_17_0_RELEASE THUNDERBIRD_17_0_BUILD2 tag(s) for changeset 1163c275c99c. DONTBUILD CLOSED TREE a=release

--HG--
branch : GECKO170_2012111612_RELBRANCH
Bug 822053 - Nested balancing column sets restriction shouldn't affect non-balancing column sets.  r=roc
Bug 824641 - Move the destroyed frame check before any use of it.  r=roc
Bug 824643 - Return early if SetAttr destroyed the frame.  r=roc
Bug 776724: Voicemail tests now import ril_consts with Cu.import, fixing breakage when packaged with Marionette. r=philikon

--HG--
extra : rebase_source : fe3effc50ea11ee9a4292d127150b7bf92fb7634
Bug 777231 - Add skeleton for mozbuild package; r=vlad
Bug 777233 - Add warning module to mozbuild to track compiler warnings; r=vlad
bug 803347 - update graphite2 lib to upstream commit 4ddfa0f51098. r=jdaggett
Bug 784563 - Investigate being lazier about removing things from the purple buffer, r=mccr8
Bug 730340 - Don't use expando properties for storing data on places nodes. Remove expandos support from result nodes. r=mak.
patent model threads.
added strata.sampling()
Docs updated to remove id var and add info about strata.sampling()
fix commit
Merge branch 'master' of https://github.com/mrimsh/InsectsDominance
dieresis si en js
Working on settings activity
changing calling detail
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/callingdetail.xml
adding placeholder to ensure parent dir. existence
Merge remote-tracking branch 'origin/master'
Added login operation and tests
Petit design en plus. Bender vous salut ...
Merge branch 'master' of github.com:muxisar/VerbierFestival
Fixed bug when same event was reused for status sending.
removed titles?
fix1130
fix1130
use session to remember params
Add option to log all API events to a CSV file
update
为每一次请求的返回添加是否已经登陆字段
1、修复logout由于返回数据中ifLogin值的bug 导致错误
2、添加ifLogin中间件
添加base64的图片处理和检查
1、修改图像处理模块
2、修改图像处理模块部分的单元测试
3、添加商品路由...( 编写中）
1、跑通addItem逻辑
2、建立了client的软连接并设置了静态路由，方便在同域下在浏览器中进行调试
图片名称中增加时间戳和用户信息
Merge branch 'master' of github.com:neekey/secondaryTrading
update
Merge branch 'item-add'
nekoneko...
Fixed config of freeze4 example. Got rid of dual repo experiment.
update init messages
修改热门链接的显示方式
修改config
修改config
修改config设定
增加task模块功能
新增urlsug模块，前端添加url自动完成功能
清理代码
修改主页js设定
“关于”页面
数据库结构更新
return timespan for extra logging
Use master.zip
more pseudocode
made default field a bit better
Merge branch 'master' of https://github.com/niekversteege/HillClimb.git
added weight to print message
Commit's Info:

- Se comeinzó a trabajar con el landing (index.html)
- Se agregó un archivo css (main/main.css) para el estilo
- Se agregó el archivo js/main.js vacio, donde se colocará el codigo.
  JQuery extra del sitio.
Fix parsing of pyon PD output for wait command
Organizing model structure
Comunication among connected players was demonstrated.
add support for other actions (opened/reopened/commented)
implemented Java sample code including a working TESTNG test
Cleaned out dummy files.
Merge branch 'master' of github.com:noah-freitas/match-lite
Removed update url from manifest
* fixed Minor issues with local storage
Changed order of the deal.
Added View::startIfEmpty($name)
Added test for View::startIfEmpty($name)
Added additional test for View::startIfEmpty($name)
Merge pull request #930 from LiquidityC/2.3_3315_viewblock_startifempty

Added: View::startIfEmpty($name)
Fix variable naming.
Move "required" and "allowEmpty" options from `ValidationRule` to `ValidationSet`
Revert default value of allowEmpty.

In 2.1, the default value was null, which does not impart any behavior.
In 2.2 this was changed to false, which makes it hard to validate ''
with validation methods.  Move some tests around and update tests that
probably should have been failing before.

Fixes #2983
Revert changes in behavior made to timeAgoInWords()

Changes made in [0729aca706e65a6d7198af22a81c25c10d88638d] changed
the generated text to not match the behavior in 2.1.
Refactor tests.

Use generators to reduce some duplication.
"Updating CRUD translations"
Change order of answer's actions
modify for preference
add 2 files
add preference
Updated index for events to prevent signup for HTML5
created a component mapper class for getting components easier
Find the first common ancestor of two nodes in a binary tree
changes to css, added footer, new links, altered wording
Got things working in advanced optimization mode.
10.7 target - 32/64 bit-intel
adds mcclurken and french's teaching w/ omeka
print the error if available instead of always printing 'unknown error'
pushing branches
Add Templates doc
do not crawl dev site
Vote strings

Copied from the fixed JKA modbase project: https://github.com/Razish/jasdk_modbase/commit/c82b1ff40ed741c9c534ac7f2285fbae872ba460
Register vocab migrations on install as well
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Check to see if the flag table exists before trying to register it's migrations, 3384
Add navbar-off and on classes, as well as header and content-none.
only show description markup if one has been set
Update Module names in spaces_features variable and any box where they are used, #467
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Merge branch 'SCHOLAR-3-0' of github.com:openscholar/openscholar into SCHOLAR-3-0
Fixed undefined index notice.
Corrected submitted/inpress/forthcoming page titles.
Merge branch 'SCHOLAR-2-0-RC1' of github.com:openscholar/openscholar into SCHOLAR-2-0-RC1
Merge SCHOLAR-3.x-make
#30: Rename patch to use issue queue number.
Fixed vsite_domain migration into purl.  #735

Added a table migration for purl WHERE provider = vsite_domain.  Vsite requires this table migration.
fix for bug#876458
Merge pull request #908 from rajatchopra/master

fix for bug#876458
fixup! WIP: main-content and tabbar
Update notes for submitted changes

* Reorganize the repo to better match the revised standard layout
Fix PAXWEB-463 added support for JDBCSessionmanager to support session
clustering
regression, change from 1ea6202 was lost in FC003 update
added other thumbs:
fixing horrible DNS bug where a dns base may be freed but the ref not cleared, meaning a freed DNS base could be reused in requests after it had been "freed." yuck. sorry. should fix a lot of strange segfaults ive seen...
Merge branch 'master' into http-stream
Merge branch 'http-stream' into future+stream
Value select hidden and shown support.
add skeleton project files, include configuration files
Merge branch 'master' of https://github.com/eldardamari/spl-assignments

* 'master' of https://github.com/eldardamari/spl-assignments:
  add skeleton project files, include configuration files
Renamed assignment_2 to hw2
Updated gitignore; deleted more eclipse trash.
committing - linkedin button version 2.0
Initial import of ysysbuilder
Merge pull request #1 from yahoo/master

merging from yahoo fork
Added SystemFiles.pm to .gitignore
Updated .gitignore
adding an import function which is the next big step
Added grunt dependency to package

Signed-off-by: Ozan Turgut <ozanturgut@gmail.com>
Merge branch 'master' of https://github.com/ozanturgut/queen-remote
Sibling/child tree
shouldn't have edited comment
modified:   .htaccess

aggiunto opzione per evitare l'indicizzazione delle cartelle

new file:   application/.htaccess
new file:   docs/.htaccess
new file:   library/.htaccess
new file:   include/.htaccess

protezione cartelle importanti

	modified:   application/controllers/MakeController.php
bugfix ordine immagini errato, cancellazione vecchi file temp
	modified:   docs/localhost.sql
nome db modificato
	new file:   include/function.php
funzione per la cancellazione ricorsiva

	deleted:    gif.php
rimosso file innutile
rimosso gif.php perchè innutile
Merge branch 'develop' of github.com:pagliaccio/nuvolelibere

Conflicts:
	include/function.php

risolto.
FIX for max frame size handling

Connection.frame_max limits the *total* frame size, including header and end
marker, which add up to 8 octets in total. Hence body fragmentation
should occur in chunks of frame_max-8.

stormed-amqp was sending frames that could be 8 octets too large.

bug reported by Matthias Radestock.
front-end
Merge branch 'master' of https://github.com/paraggupta1993/facetube
Merge pull request #1 from itsyash/master

Front-end merged
Changes on Travis:
  * Remove Ruby 1.9.2 testing
  * Allow Rubinius to fail
Add encoding: utf-8 to cs.rb locale file.
Add encoding: utf-8 to th.rb locale file.
Strip trailing whitespace from mn.yml which was causing jruby's Psych to fail during parse.
2-0-stable should be using 2-0-stable of Refinery CMS too.
Remove commas that were unrequired (at hash end)
Merge branch '2-0-stable'
Revert "2-0-stable should be using 2-0-stable of Refinery CMS too."

This reverts commit f7b5aff284e16ab84f0a1de03dae0a0deab31499.
Fixing a QA bug
started work on ui
APT Chapter 12 - Step #1 (Create a Stub Activity)
Adding the detail form class
Fixed a protocol bug with version older then 41
Bug was introduced in 05fd4842015c7263027702200f0e861a3c263c2e
Added more regression tests.
Use Twitter default for PASSWORD_MIN LENGTH
Applying plugin sysconfig against 5.1.1
adding flatpack-obj files to generated output
Added nickname and time and date for messages
add more settings for top-bar: $topBarDropToggleColor, $topBarDropToggleAlpha
onmousedown jquery-less!
Modified boilerplate comments
Fixed full path jar libs deps

Signed-off-by: Pedro Nunes <pgh.nunes@gmail.com>
Merge branch 'master' of https://github.com/pgnunes/Meerkat-Monitor.git
Use package `uniquify'
adding monit config
two servers bashing one client
added pthread DLL for MinGW32 version
프로토콜 고정
adds bullets and fixes velocity bug
Sets ranking path link
- use php(core) for php engine version deps
- release 4 (by relup.sh)
Close #11317
added history info
Merge pull request #42 from keul/master

Fix for #11317
use the top-most toolbar-button id to identify what overlay was opened.
remove forgotten alert statement
When adding new content, upload by ajax and refresh afterwards.
Remove kupu from the test dependencies.
Add 'before today' and 'after today' operators.
fixed the viewloading, its working perfect now
Code Ready for submission -

Finally done. Guess what Satish, now we know how to do Github!!!
Add SimpleDate and SimpleDateTime
Improve SImpleDate code
Allow Field rendering context to be customized

Extract the current inline context into a method, renderingContext().
In this way, by extend()ing or overriding Form.Field.renderingContext,
one can use other data in the template.
Merge branch 'master' of https://github.com/drd/backbone-forms
Docs
Distribution files
Change descriptiom list style.
Renamed GitDev directory to be correctly numbered
Merge branch 'master' of https://github.com/profjsb/python-bootcamp
Fixed bug: clipboard view and option menu view appear at wrong place
when orientation is landscape. 
Added function: toggle ring mode - normal / vibrate
Fixed: PHP error notice in replies view
Removed duplicate form fields
Merge remote-tracking branch 'origin/alpha4' into alpha4
Css/layouts no longer should reference yui
Fixed compile issue related to defer attribute
Cisco spa5xx
-Allow users to setup and use GZIP compressed configuration files
HPCC-8284 Regression Suite - Moved pathing of regression suite run

Moved pathing to standard locations by default.
- /var/lib/HPCCSystems/regression
- /var/log/HPCCSystems/regression

Added debug logging of used directories.

Added Error for suiteDir not defined with notice to set in regress.json
or with --suiteDir option.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
make jdk_bin global
added site as a submodule
add rule for validity of identifier
added testResult area in template
included Kendo
grid columns are now ols
TestResultGrid now displays tests and results
renamed and removed ol styles
expected results are now displayed
ol headers move out of ol
loadTestGridData now loads all grid data
regenerated docs
updated docs
regenerated docs
accepts zip files
Better views.
Limiting the mimetype per datatype
DatumAttachment
various installfest edits
improve 'git add' explanation
Merge branch 'master' of github.com:railsbridge/installfest

* 'master' of github.com:railsbridge/installfest:
  The [toc] for a site is now generated by traversing the site.
clean up formatting for new xcode step
[maven-release-plugin] prepare release extdirectspring-1.2.0
fixed a tiny crash
adding all code files
increased engine node
decorator uses a more effcient prototype style enhancement of the prototype functions
interfaces angelegt
new klass.js
copied over daisy (by enrique)
netpd2-ified daisy
Editing template input fields and dropdowns no longer causes the input field to become unselected in IE
denovo com meu nome
초기화 테스트
sending initial payments
Debugging: add a grid to each dependent transform to help visualize
Add ability to disable a button
Add a recording controller and move the recording logic out of selection controller
recording controller needs to be initialized in main.
Simple Buttons should callback on down as well
rename usertransform methods
rename usertransform
Revert "rename usertransform"

This reverts commit c966e2c50ce4d8757553035f09ac559c5e442a56.
UserTransform can animate with or without interpolation

(prerequisite to recording)
user transform span start times should stay updated
perform check when setting interpolation
simplify interface for new user transforms
let each data point be either interpolated or recorded
Instead of explicitly setting interpolate vs recorded frames, just base it off of the timeDelta
input.hasTouch to expose touch capabilities
Add a recording button to collect recorded streams.
Include Recording.lua
Play button should be disabled while recording
Erase in front of the current time as we are recording.
adding comments to front page.
Remove nils from filter

This fixes a nil related exception for cases where
the filter did not return anything.
Merge pull request #6 from bodepd/nil_error

Remove nils from filter
New Formula: Zend Debugger for PHP 5.3

Zend Debugger is PHP extension that enables remote debugging and profiling using Zend Studio, Eclipse with PDT etc.
http://files.zend.com/help/previous-version/Zend-Server-5-Community-Edition/working_with_local_debugging.htm
Added Site layout
Added tonic and php dispatcher.
Got some local changes in the js file by accident. Reverting to latest version.
Modelo standalone de redefinir senha (senha-reset.shtml e senha-reset-ok.shtml)
cleanup tests and add beginning and end to binary field
tests for binary tools. also fixed encoding 0 on to_bin
support for binary format
precalculate 2**64...
added todo
test uneven number of digits in hex and binary
add primitive field Binary
started work on binary fields
added test for two dimensional array
Added php memcached extension
Merge pull request #4 from rockamorales/master

Merge
Merge pull request #5 from rockamorales/master

Modificaciones comprobante donacion
Merge branch 'master' of github.com:schumy21/ClinicaEJB.git
Merge pull request #99 from schumy21/master

Schumy SalidasProductoEJB
First commit
Merge branch 'master' of https://github.com/rocky-jaiswal/tweetbeat

Conflicts:
	.gitignore
[Exynos4] added support for samsung codec

Change-Id: I7ed5034ad847fe312fbe79624fa24e097dc547e8

Conflicts:

	media/libstagefright/OMXCodec.cpp
alterando dados do settings para o ambiente de produção
修改数据库选项
Merge branch 'groovy-devel' of https://github.com/ros-planning/moveit-ros into groovy-devel
Merge branch 'groovy-devel' of https://github.com/ros-planning/moveit-ros into groovy-devel
Allow flip orientation for IK on goal pose. Fix for removal of start states
Load constraints automatically when loading a scene
default name for start states built from the robot name
Clear previous start states when loading a scene
Warn the user before removing constraints on the database
Merge pull request #64 from marioprats/groovy-devel

Fixes in the constraints tab for improving usability
added max parameter
Fixed undefined global variable
- Removed redundant cache.cache_id column (#1488528)
Removed users.alias column, added option ('user_aliases')
to use email address from identities as username (#1488581)
having image compute it's vhash
campo notificado en integrante guarda "si" al crear grupo
another two years of galleries
Implemented basic functions of bChatManager - the chat formatting functions. :)
Prima versione dello script ant per l'importazione dei ws
edit item validation repaired
make the index table display calculated fields
Add title module
Update Makefile
Suppress some warnings when building package
Update README
Fix some bugs around initilizing thread
Update version, use TFF 0.0.2
[fix bug 699812] Groups shown in search results

fix break in search text

whitespace fix
added accounts.sql
Added description how to deploy the binaries
Added ability to remove players with no opponents
Add java-sun option.  Update alternative and seed as required.
ssh: removing default interfaces attribute to avoid merging of interfaces
Better error for pipeline parsing failure.
UPdating features, and the actual features to actually work
Merge branch 'master' of github.com:schultetwin/create4stem
add features locael
Adjust copyright statement.
Remove left-over institutions file.
Add several Enumerable plain accessors
Grid math and broken into partials
fix grid output selection on grid objects section
Binaries....didn't originally commit.
Speed up detection with caching
Merge pull request #3 from SublimeText/master

Speed up detection with caching
GraphicModel  class extracted
Update russian.
removed JBoss Deprecating Repository from the parent POM in favor of a mirror instead. added configuration example in README.txt
session login/out
LPS-26879 - Clean up theme images directory
Language keys
Fix for dynamical Rubygems require, closes #5
Merge pull request #9 from hron84/fix-bin-translate

Fix for dynamical Rubygems require
Let GitHubCore do some of the work for to_json
Split Repository into it's own file.

Stop creating a Repository object in github3.issue for an Issue. Simply provide
the (login, repo_name) tuple so someone can fetch the Repository on their own.
Otherwise, issue.py will be a horribly large file with more than one section
inside of it. Do they have functionality which over laps? Certainly, but
following the API documentation, this is a saner way of organizing the module.
Fix a couple bugs. Finish labels. Start milestone

Updated README to represent where I am. Also, tired of constantly using the
python interpreter to test the module. So I created a test.py file which will
let me test what I want without having to constantly enter my username/password,
etc over and over and over again. I just don't want it getting accidentally
included in the repository.
Fix some bugs on flFlags.
Bug fixes. Replace imfeature with regionprops.
----
LSGrids: adds "SelectFirstRow" and "SelectLastRow" methods.
debugo
Binaeren Suchbaum implementiert
Removed unnecessary 'explicit'
Fix some memory leaks, minor changes
Pfeile für Menupunkte added
Fixed|libdeng2: Files can only be immutable input streams

The assumption with modifiable input streams is that the read bytes
are gone after having been read. This assumption is not compatible
with how byte array files work: the read bytes persist. Therefore,
byte array files can only be used as immutable streams.

However, Reader will automatically check if the stream can be casted
to a byte array, as byte arrays provide random access and are
therefore more useful for reading.
libdeng2: Added LOG_DEV_TRACE macro

Developer-only debug messages only included in debug builds. These
should only be used for internal things that only devs comprehend and
could appreciate.
Refactor|libdeng2|scriptsys: Simplified Record's internal structure

de::Record no longer keeps member variables and subrecords separate.
Instead, any member variable that owns a record is considered a
subrecord.

When records are serialized, they are identified in the serialized data
by unique identifier numbers. This allows deserialization to restore
references where variables refer to other records in the serialized
data. (By default, records are serialized and deserialized by value.)
Fixed|libdeng2: Script parser bug related to ':' in if statement

If the condition expression contained a ':', it was confused for the
':' that may come after the expression.
libdeng2|Script: Added "export" statement and keyword

"export" can be used to lift variables to the next higher namespace.
It can be used on existing variables and with assignment.
libdeng2: Applied pimpl idiom in App
libdeng2: Revised the deng.de script

Added the function useDefaults() that is used to setup a namespace
with the default configuration. The function is serialized for later
use, and is also available interactively at runtime.

The script uses a more robust logic for checking version upgrades.
Both new builds and new releases are detected.
Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine
libdeng2: Added a semantic hint for number values

The semantic hint suggests what the number is being used for. Added
a hint for Boolean values. These will be shown as "True" and "False"
when printed.

Serialization of NumberValue was changed.
libdeng2: Cleaner text representation of Records

Records are converted to text in a way that retains the structure of
the record more clearly: both subrecords and referenced records are
printed as an indented block.

Furthermore, a subrecord uses '.' as the separator in the output while
referenced records (and other values) use ':'.
libdeng2|Test: Test record reference deserialization

The kitchen sink test script now includes a case for serializing and
then restoring references between records.
libdeng2: Cleanup
libdeng2|Documentation: Added a clarifying comment in deng.de
Documentation|Readme|Unix: For man pages, use a shorter title

"doomsday" is the name of the executable/package.
Fixed: Compiler warnings

Order in initializer list. Also removed unneeded calls of default
constructor.
libdeng2|Script: Constants should be in all caps

Converted the members of the built-in Version module to all caps as
they are all constants.
Refactor|libdeng2|Record: Improved addArray() method

An array value can now be provided at time of creation.
实现文章管理功能
Header type: no need for multiple values.
Makefile: s/mv/move/g and so on
Better conduit equality constraints
Migration and model for payments
Handle 'Connection Refused' errors from OpenGraph

This can happen on malformed urls that are nonetheless parseable
by URI.parse.
Moved comments with notes and changelog out of the license comment which is kept after minification.
added path to log file in parameters.ini
Rename hosted.h to xwayland.h
Adapt to new initialisation sequence
repeater tests and refactoring
finished submit button
added routing to submit button
Merge pull request #13 from spencerapplegate/sa/finish-submit

Sa/finish submit
Include caab SKOS file
Maven, Spring Nature 추가
Not threadsafe.
integer reply could be a long
Merge remote-tracking branch 'origin/pk-is-zero-fix'
always convert content-length header to be a string for signature purposes
It's wrong to consider that any model in a BaseHandler should be considered as nested. A BaseHandler might as well return models, as first class citizens of its data response. The extra check in the model class, makes sure that in those cases, the representation of models is still valid
Modified the layout of the tests presentation
After few upgrades and refactor, also start of sfml2 branch
Deleted files
SFML2 working->super performace boost
initial integration of TGUI
refactor, physics class, sfgui(gravity, GPweight)
new gui controlls, refactor
emmiter class, it's initial integration into particleGroup
physics update
draw mode, new gui controlls
dynamic colors
automaticMovingObject
GravityPoint interface and auto/mouse implementations, removed initialization lists in ParticleSystem constructor
ColorManager, color trasitions
refactor gui code
refactor
commit fix affter accidental wrong usage of git add
graphics data
particle count hotkey, physics class refactor
another refactor, pointer to pointer in pariclePhysics removed
broken in the middle of work
Merge remote-tracking branch 'mainline/master' into refactorpowers
Chain coif added and recolor of chain armor
Plate helm art added
Don't play menu close sound on death
Fix bleeding spurt being shown when player is dead

Closes #148
Merge pull request #140 from stefanbeller/refactorpowers

Refactor powers and hazards to use animation class.
Merge pull request #60 from stefanbeller/refactorpowers

Refactor powers and hazards to use animation class.
Merge remote-tracking branch 'upstream/master'
Merge pull request #149 from dorkster/fixes

Fix problems on player death
Merge branch 'master' of https://github.com/clintbellanger/flare-engine
Fix issue #151 equipped item quantity reset to 0 on game load
Merge branch 'master' of https://github.com/clintbellanger/flare-engine
LootManager: Use Animation class for managing images.
Animation definitions for loot.
Merge remote-tracking branch 'engine-origin/refactorpowers' into refactorpowers
Editing SS lifts now persists
Added a second player image
Fixing issue with cached crumbdata missing new filEXT req
fixing missing subType error on extended attributes listview
Removed Navigation#getRootNode as it is not required by implementation any more
split of cmp relationship tests
Initial implementation of inter-deployment dependencies
Some work on the FakeMPD Server
stupid typo rwar~
Revert "Merge branch 'master' of github.com:stuycs-ml7/project1-pd7"

This reverts commit 226ffc09f27ac83fb6e92677678e9f2e9bc9b51b, reversing
changes made to 90cf3cd9b759e4d09ed722b30c0dd814c52e77f1.
x
Merge branch 'master' of https://github.com/stuycs-ml7/project1-pd7
changed a bit more efficient
ReplyTo is fixed. Changed some fruit.
Bolded distribution labels.
Capitalized column names. Added event id to edit event dialog.
Merge branch 'master' of github.com:styfle/The-Harvest-Club
basic geolocation stuff
NJ: Events
now allowing for submeto subscriptions
move system.routing.route.create to router on addRoute
Merge branch '2.0'
added a wrapper for everything
the-team vcf added
Improve the comments and rights
Add a special-case implementation of PCMPISTRI $0x3A, which generates
in-line IR instead of calling helpers.  This is so that Memcheck can
do exact definedness propagation through it.  This is important for
dealing with inlined PCMPISTRI-based strlen calls.

#309921, comment 6.  (Patrick J. LoPresti , lopresti@gmail.com)



git-svn-id: svn://svn.valgrind.org/vex/trunk@2562 8f6e269a-dfd6-0310-a8e1-e2731360e62c
added SearchBundle
another attempt at getting to a reliable setup with composer
Null default value route regression
Router#resolveString should return null instead of empty string when $value is null

Closes #4823
merged branch merk/routing-bug (PR #4823)

Commits
-------

c061c30 Router#resolveString should return null instead of empty string when $value is null
a1d1a02 Null default value route regression

Discussion
----------

[Router] Null default value route regression

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #4823
Todo:
License of the code: MIT
Documentation PR:

---

The commit by @vicb 0555913fbbad5ce29b7dd836155f832d5cfc288f introduces a regression in the handling of default values that are null, while there are requirements still set for this value.

This is a failing test case and fix for the issue.

---------------------------------------------------------------------------

by merk at 2012-07-10T04:24:40Z

Now contains a fix, tests now pass.
[FrameworkBundle] tweaked previous merge
Auction model + Auction controller + Auction view
Update properties file (cleaning)
exit on BadStatusLine to fix UnboundLocalError
Added profile for each role
Merge branch 'master' of https://github.com/tae1560/2012_db_project
aikataulukuvat
Test fixed.
pep8 & pyflakes applied.
So, it looks pretty, but for some reason, every time you click "Create Unit," the whole panel SINKS.

Signed-off-by: Michelle Len <mlen@umail.ucsb.edu>
Merge branch 'master' of git@github.com:tan01/G05-NewtonToolbox.git
add borrowed item

Yuyongjiang
fix dirname too long
finished smallest in array function
Fixing a tracereport crash.
css?!
로케일
Updated to the latest AROMA
Updated permissions script
Added todo.txt
Added bash
Updated busybox
Tagging 4.5.0-beta.

git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@4032 2fea6a4d-a838-0410-917b-93a53c48e9d2
upgraded to django 1.4
adding project file
Merge branch 'master' of github.com:theicfire/005-project-2
added the create page, no ajax yet
PeridoBeta Terminado
Revert "PR#5652: Try to use camlp4.opt if it's possible"

camlp4.opt works only with native plugins therefore the fix will break bytecode camlp4 plugins.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13167 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Added tube modes
Block Time
Added double tap to zoom on picture viewer.
set magit-item-highlight

Otherwise, switching from zenburn leaves it as zenburn-bg+1.
Merge pull request #46 from hdhoang/magit-item-highlight

Set magit-item-highlight.

- Otherwise, switching from zenburn leaves it as zenburn-bg+1.
change org-scheduled-previously from orange to yellow
Merge pull request #43 from thomasf/master

Added faces for bm, helm, moccur
minor formatting change.
Modified comments to reflect previous file name change.
fixed closetag include
fix line in readme
fix the line differently
booya
Add avg to ladder
Merge Mike Changes
1. Intial rails release.
Added rubyforge project
Defined author model. Broke a bunch of tests. Go figure.
PxFW本家の更新差分をマージ
Update README with license.
MONGO PORT
finnished concept level
added loader and changes to collections and views
omegAAADDD MAX
OMEGAAAD MAX
Merge branch 'master' of https://github.com/tpepels/lcrt_negotiator

Conflicts:
	src/agents/LCRTAgent.java
resurrect the status image too, but hide the branch selector for now
hugely reduce time that dda_step hogs interrupts, add selectable endstop polling with debounce
move endstop-related constants out of dda.c
fix double update on current_position
algorithm proof of concept in perl, partial implementation in c
more stuffing around with the algorithm, looks like we have to use floats during setup for this to work
tests pass
rock test passes
initial commit of gh-pages
Merge branch 'gh-pages' of github.com:ttscoff/htmlexperiments into gh-pages

* 'gh-pages' of github.com:ttscoff/htmlexperiments:
  adding a button test
  Initial commit
[First Nav Ever] ATMOV2
[competition entry]
Attempt to create ATMOV4 airframe
ready for next flyoff
ready for final baseline
fix ":in-viewport"
Merge branch 'master' of https://github.com/jpalardy/jquery_lazyload into 1.8.1
Maps for the Way to Yurt
fixes for map 049-1
merged branch newcaves
Changes for kylian's foodstore
updates for kylian's foodstore
Map + Caves, + changes in 013-1 for warp
Merge branch 'penta' of https://github.com/tux9th/tmwa-client-data into penta
Preliminary validation
Added new display option for range items in the selection dropdown
A lot of changes here. The project skeleton is now here, with each team's files separated into individual groups. The main story board is also set up with appropriate transitions between interfaces.
Defined properties for UMATweet
Attempting sync again...
Just moving some files around...
[Say] Give error if bot not in channel requested
changes in header.phtml
License and Readme
agregado de  "remove"
Remove elog_mmc
removed shit from setttings and widget
Removed extraneous render target.

(Leftover from back when I was considering providing shadows as a built-in
VectorStorm feature, instead of extending VectorStorm to support game-created
shaders)
Update "spot" on the details screen to "space"
Fix image on reservations alert
Running suites in more simplier.
mouse circle
pkcs11: #371: Public key create template should not include CKA_MODULUS_BITS

Thanks to 'z22' and Martin.
Revert "Revert "new gadget xml""

This reverts commit fc514251ae6f84c19fde476b0a3a48eae31a3c33.
rename extended MVC class to Mvc in controller class
Adding event for camera access - compiled
Forgot to drop LICENCE from the PKGBUILD.
Completed TextEventDispatch and added test project

the test project of companion is not complete
Merge pull request #1 from voxbright/JoeWork

Completed TextEventDispatch and added test project
Added note about UTF-8.
added some folder
1 修改Dlg实现。OK或者Cancel键按下后，对话框关闭可控。
2 加入错误提示类， QPopTip (item.cpp item.h)
3 SysPage和FilePage中的操作加入错误提示。

Signed-off-by: ElmerNing <ffxhina@gmail.com>
Merge branch 'master' of github.com:wangzhengwei/StripChart into debug_ny
More codebender fixes
Add basic support for multiple scanners
Login seems legit
fix bug about loading config.php
Fix expected package test
Fix test suite
Fix generic qualified types
Use type instances where possible
Fix qualified casts
Fix qualifiers while searching for a class
Merge pull request #36 from weissjeffm/SAM-1.1

Sam 1.1
move fake cds content out of inecas' scratch area (which was recently deleted)
configure ADC frequency and reference
remove map function
calculate servo times between frames
fix timer prescaler
add trimming parameters
average adc readings
add scale factors
added reports views.
renamed specs (they're running on deploy)
Support reload on change option

This allows the user to specify :reload_on_change in the options and
have guard reload the redis process if any of the monitored files are
changed.

Other updates:

* Allow Redis 2.2.2, which is required by version 1.0.0 of the
  redis-store gem (the only version compatible with Rails 3.1.3). As far
  as I can tell there's no real dependency on this gem disallowing Redis
  2.2.2.

* Use Guard's UI.info instead of puts for prettier output in the Guard
  console session.
Merge pull request #2 from jshafton/master

Reload on change support
added css multi-columns to form
Fixed a corner case where exception handler was placed after an artifical nop.
updated Gemfile and tags
APT 2 finished.
ensured javascript works on django template
added groups, rosters models
added GroupManager model
added RosterManager model
updated docs
Initial commit
First cut of new Shell script
Replaced references of WASTEBIN to ~/WASTEBIN
Also interactive/recursive option moves found files.
Tiny change adhering to my new preferred indentation style
changing recursive logic
throw away recursive work and start again
start to rebuild recursive routine
Tiny change to header (rR)
continued development of recursive routine
Merge https://github.com/wrightdkevin/saferemove
modified file remove messages on recursive routine
replace file move messages with actual move processing
start refactoring of removal of empty directories during recursive processing
one step back
Remove empty processed directories during recursive work
Superfluous commenting
removed non rm style echos and modified the rm style, the messages output are still not 100% rm compliant
Coded simple use of the V flag
factored out v flag processing
commented the vflag move function
removed Data::Dumper from every file
add china to 12
add rapidxmltest
Recuperation de la photo apres conversion Bytes/Image, mais affichage impossible
- Implemented an helper class to handle mpf_t as RAII
Revert "改回用RJSON包，在公司UBUNTU和个人WINDOWS7上可以用，个人UBUNTU上有编码问题待解决"

This reverts commit 75cd9f77ddc7fc04539bbba08cbdef38f406fadb.
General clean ups + support for local cloud on linux
add zsh custom directory
Added "accessToken" parameter for using previous session tokens
Fix formatting in clientprivate.hpp
Remove submodule
Fix  config for Travis testing
added profile
finished cause profile
mess up profile links
testing profile link
changed back profile link
added default prof pic
done for the night
added profile and edit links
remoteAPTclient wrapper no longer depend on the PATH
Lots of client fixups, and moved webbit stuff to separate namespace.
Now shows an informative dialog when the editor is unable to find any Minecraft PE worlds
Forgot to add robot_monitor_widget.
Submodule DOC
Merge branch 'master' of github.com:zonyitoo/EduAdminSystem
Try to fix artefacts on the right side of the iPad frame.
Add gradient background of the web page.
trying to fix problem with the gradient repeating on iPhone
Various things

- Added modified notice.
- Added import "Set".
- Reorganized layout.
- Fixed Python "Indexerror".
- Added code to auto-follow users.
- Fixed Python "json" error.
menu callback for "inner" front page

Signed-off-by: David Meister <thedavidmeister@gmail.com>
Merge branch 'master' of github.com:2-Times/two_times_global
Adjust main template also for izug and use correctly them name in upgradestep.
Add hi-res iPad Apple touch icon.
Moved readme to readme.md for special handling by gh
Update translations from Transifex; changed: mb_server.de scripts.de
Update translations from Transifex; changed: instruments.de instruments.ja
added the behaviour of the sequence ant,
messing around with maps
Minor tweaks
updated readme
Phone: Add transparency to incall screen

Makes the background of multiview semitransparent.
It allows to at least see whole image of incoming caller.

Change-Id: I920fee43e3bac7492a54f43281716eb8b686aa5e
Signed-off-by: kecinzer <kecinzer@gmail.com>
Merge "Phone: Add transparency to incall screen" into jb-mr1
Added Apollo music player;
removing print statements
removing old comments and a print
Update common/buildcraft/builders/ItemBptBase.java

Shows templates and blueprints in creative inventory.
Makes buckets  while player creative mode
makes buckets unused while player creative mode
Makes buckets behavior like in creative mode
Proper fix for clearing the path markers list, and fix for connecting to path markers on a different world.
One (hopefully) last bug on path markers
fix NPE if pipe does not exist (null pipe)
Fixed Pipes not connecting to tile entities whose blocks don't extend BlockContainer
Merge pull request #289 from psxlover/build.xml

Lets hope it works.
Merge pull request #285 from Kubuxu/buckets

Creative buckets behavior and template and blueprint in creative inventory
Merge pull request #293 from Xfel/master

Fixed pipe connections with tile entities whose blocks don't extend BlockContainer
Merge pull request #291 from Flow86/patch-npe

fix NPE if pipe does not exist (null pipe)
Missing import from pr #283.
Merge pull request #295 from psxlover/master

Missing import
Added new functionality, fixed some small bugs and getting ready for the last feature to implment.
OpenMoko kindly assigned us our own USB IDs
http://wiki.openmoko.org/wiki/USB_Product_IDs#USB_Vendor_and_Product_IDs
Discovery configured by configAdmin
Signed-off-by: Morand <denis.morand@imag.fr>
Add type property
remove duplicated method, it is on the parent class
Change bindingcontroller tracker to track instance instead of type
Add type to properties
Create instance description
remove debug sysout
Add minimalistic TCP adapters
Remove unused import
Add cilia as namespace in adapter
wait more time in EA
enable global simulation listeners to get person, device and zone property events
agiliza.core.utils.decorators added
fix old bug in delete_message, add better handling of timeouts
add callbacks for retrieving font size and family, make bar transparent
1 error verholpen trafficlight = cartrafficlight