labofsahil/github-event-dataset-2012 huggingface dataset:
fmt
MEncoderVideo: cmdArray -> cmdList
docfix
restore max buffer size to 600 MB
flag unexamined code
fix failing Jenkins tests: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4466485
thank smo
Merge remote-tracking branch 'upstream/master' into LQmaster
Translate the title of the MessageDialogs
Translation update
Merge pull request #90 from valib/master-translate

Translate the title of the MessageDialogs
add ffmpeg build versions
docfix
CMake tips
docfix
ffmpeg build script: rm unused option
clean up #90
Merge remote-tracking branch 'upstream-master/master' into pms-lv

Conflicts:
	src/main/java/net/pms/messages.properties
	src/main/java/net/pms/messages_cz.properties
	src/main/java/net/pms/newgui/GeneralTab.java
	src/main/java/net/pms/newgui/TranscodingTab.java
#402 - gh-pages branch - fix custom failed upload text display for Firefox
Merge branch 'master' of github.com:vanillaforums/Garden
Merge branch 'live'

Conflicts:
	applications/dashboard/design/style.css
Added some extra functionality to the Gdn_AuthenticationProviderModel.
Merge branch 'live'
Merge branch 'master' into feature/urlfunctions
Allow ArrayTranslate() to work on objects.
Allow urls to end with a trailing slash if the programmer wants it.
Merge branch 'master' into feature/urlfunctions
Fixed bug where new conversations don't go to the inbox.
Make sure all users in a conversation get DateConversationUpdated set.
Added a proper count to the site totals module.
Merge branch 'master' of github.com:vanillaforums/Garden
DeviceManager: handle null entity classes returned by classifyEntity
Merge remote-tracking branch 'floodlight/master' into addrspace
Merge into master from pull request #205:
DeviceManager: handle null entity classes returned by classifyEntity (https://github.com/floodlight/floodlight/pull/205)
Change OFPacketIn.MINIMUM_LENGTH from an int to a short. OFPacketIn.setTotalLength() expects a short.
IDevice should not expose getEntieties()

BSC-2116
Fix: IndexedEntity.equals() wasn't symmetric.
Checking for tunnelEnabled does not belong in Topology.

BSC-2116
Merge pull request #206 from maiergre/addrspace

Some small fixes (IndexedEntity, IDevice, tunnelEnabled)
Merge branch 'master' of github.com:floodlight/floodlight
Merge into master from pull request #207:
Random fixes (https://github.com/floodlight/floodlight/pull/207)
BSC-2021
Add a unit test that makes sure an exception is thrown when someone tries to remove a switch from the active switch map.
Merge into master from pull request #208:
Another controller unit test. (https://github.com/floodlight/floodlight/pull/208)
Correct the set/get of TOS bits in OFMatch. The 6-bits of DSCP need to be top 6-bits of the network ToS byte.
Remove public setters for things that don't need to be set
Bug fix: prevCluster assignment is changed to reflect the L2 domain ID of the prev entity.  It was possible for cur and prev to be swapped when duplicate attachment points were detected, where the prevCluster could have the wrong assignment.
Merge into master from pull request #209:
Assignment of prevCluster is changed to reflect the L2 domain ID of the prev entity. It was possible for cur and prev to be swapped when duplicate attachment points were detected, where the prevCluster could have the wrong assignment. (https://github.com/floodlight/floodlight/pull/209)
Make IPacket's cloneable.

Cloning is currently implemented using serialize()/deserialize() which
isn't terribly efficient, but one an always revisit if performance
becomes an issue.
Merge into master from pull request #210:
Commit to fix set/get of the ToS bits in the OFMatch (https://github.com/floodlight/floodlight/pull/210)
Entity.toString: fix mac address string length
Merge remote-tracking branch 'floodlight/master' into addrspace
Added implementation that keeps track of maxForks

This allows for proper termination of parallel operators.

Also added the starting point for the incrementWaitCount() and
decrementWaitCount() feature that is similar to TBB's.
Added facility for specifying levels of concurrency
Added CSS for Detail
Merge branch 'master' of https://github.com/vfernandez/gordivery
Added pre-fetch.
change routes of the service to /:path/size/:size
add engines information, and increment version to 0.0.2
set cache-control header to one-day
added max height and weight (2000). Added possibility to render image without size (goes to default image size)
add favicon.ico
Version 0.5.106
Incorporating GitHub logon
Refreshing caches
Version 0.5.107
Added release message
Version 0.5.108
Updating deployments to include new GitHub access/secret keys
Implemented inotify_close and inotify_rm_watch.
Minor fix for Rails 3.2
mod gradient
first steps with ogre3d rendering system
further work/experiments on ogre3d renderer
update TODO
add instance identification for SceneObject class to render extras, bombs and walls
Merge branch 'master' (with basic event-system) into ogre3d_renderer

Conflicts:
	src/game/SceneObject.cpp
	src/game/SceneObject.hpp
	src/render/SdlRenderer.cpp
starting a very primitive implementation for the ogre3d renderer
add cmake switch to disable Ogre3D usage
Merge branch 'simple_ogre3d_renderer'

Conflicts:
	src/Options.hpp
	src/render/SdlRenderer.cpp
move renderer resources to their new subfolders
move SdlRenderer source files into subfolder (like the Ogre3D renderer)
move the non-resource renderer into their own subfolders
add cmake option to turn off usage of OpenGL
- updated connection editor at the android client
s5pv210: herring: Reduce MFC, FIMC and JPEG memory usage (noobnl)
drivers: mfc50: Hack for bigmem
Apache httpd support v0
apache httpd installer v1 (v0 has apr compat problem...)
more_perl support
obsolete
Add post-receive script for git to tigger build in Jenkins
Display home page slideshow captions.
csv形式をビューに記載
Second change to project 3 file.
First changes to Project 3.
Do proper escape encoding for string generated into PHP files
Merge branch 'release/v1.4' into develop
fixed #54 #53
Fixed race condition...
Merge branch 'release/endraceconditions'
enclose in quotes in comma or
Merge branch 'shf_rename' of github.com:webnotes/wnframework into shf_rename
merge
website, product and grid bugfix
change in copy logic: do not set values as blank for no copy fields. Instead, just do not copy them
Adding better button control for images
Add node.js 0.8 to travis config
Fixed bug "existsWitnessForUnsameness" in
"src/DecisionProcedure/OrientedPoint/AngleConsistency.hs". Also added
"existsWitnessForSameness" since there can also be one witness for this.
Merge branch 'develop'
modified cloud
device scan for serial based communication
Modify StyleValue()
Modify StyleValue()
getDeconstruction()
Modify TransitionStyle()
Fixed state-correction bug
It boots again!
Spec copy
新文件：    net-im/longene-wineqq/longene-wineqq-20121130.ebuild
SPLASHPAGE
Adds a required field to an api property
Added wouter file
更新repeat
Merge refs/heads/jellybean
Merge branch 'jellybean' of github.com:xAOCPx/device_sample into jellybean
structure search via jsonp
add localiztion and support ipad
Site updated at 2012-07-26 05:37:50 UTC
modified:   CNAME
	modified:   index.html
	modified:   js/index.js
XWIKI-8082: Can't inject reference based resolver using the old role/hint
XWIKI-7866 : List XProperties can contain invalid character when displayed in edit mode (select / radio)
XWIKI-7976: Migration R40000XWIKI6990 (IDs) fails to properly migrate document statistics
merge 915
support numberline width and height settings
quick fix
restored file to be in synch wth master
Merge remote-tracking branch 'origin/915_plus_mike_fix'
Added selection modifiers
right click to add initiator and left click to add soma
Dendrites can't end on themselves now
支持只输入邮件前半部分登陆
Removed all the rvm's that weren't originally targetted anyway, because they fail (surprise surprise).
bumped cljsbuild version
Added reminders job
add map logic & UI
updating data
mass test 10
modify to make sure the content of the boot.htm always appears in the
bottom of the page
added first files to Project 3.
Add TestNG annotations
update hamcrest version to 1.2.1
Merge branch 'master' of github.com:zanata/zanata-parent into integration/master
added tests to make sure new_derivation works
All created tests pass. Will create a new project automatically when there is no default project available
finished writing tests for new_dervation and derivation_dialog
Copied pkgs from AUR
Page navigation for v1 of manual
chanage to port 80
Week 4 changes. Added tables and forms.
MESSAGE!
Remove PeerDescriptor
Added SendMovePeer
various fixes in employees and aircrafts
Smazani par praznych radku
add now html
ok ignore that last commit.  I fail
registering and queuing superscrollorama
fix doc: git instead of SVN, allowing rewrite rules in apache
return actual http headers
Change AWD Comments ads
Fix ads
Initial Eclipse commit.
Initial project structure created.
Merge remote-tracking branch 'origin/master'
Move setupAjax to System and add case in System.out for IE browser

- IE doesnt outputs object property by proprty but only "[object Object]"
- add support.cors = true in setupAjax
Move setupAjax to System (again) and add error output to main classes
[SHRINKWRAP-425] Fix Coburtura configuration in Oracle JDK7
Added scrolling, layering and solar animation
Because sometimes things don't read right.
implemented work with Enum type
updated dialog controller. added function buttons for $.tk.dialog
Updated the snapshot and release repositories to clarify what they provide.
wip, working on next episode notes
new cameranames
Improve destroy lifecycle for AtmosphereRequest/Response
Make the write operation more fluid
Port fix for #776 Resuming with Serializers
fixed bug so that report pulls only main diagnosis and ignores the details
Merge branch 'master' of github.com:BaobabHealthTrust/OPD
only input & camera left to do
Added directory change tracker
Rearranging policy and support
added impport flash and redirect to views.py
Main.java editada com testes
Board.java com novos metodos e metodos modificados, são eles
  -setCharacterPosition, que agora recebe a somente um int Pos
  - getCharacter, que recebe um int e retorna o character daquela posicao
  - getCharacterXY que recebe um character como parametro e retorna o Pair<X, Y> de posicao do personagem (usado para calculo de distancia de ataques)
BoardPosition.java Alterado apenas o metodo setPos para position = pos;
Criado um metodo toString na classe Pair.java
Polish up border bypass handling a bit
Get rid of useless Caps-Lock and make it function as Escape
_UpgradeReport_Files added (VS Upgrade Report Folder)
UpgradeLog.XML ^^
Removed unused import System.Web.Mvc from SecurityConfigurationSpec
data
build
Revert "Revert "First draft of test and random""

This reverts commit c30e289dc8b3f077c9bc1452e1f6793a33a6f4d7.
Simplify part 2 - AI
Update waypoints for new AI
Merge branch 'simplify'. WARNING: API BREAKAGE - things using the API will likely break
"Gastro Clax" in the works

Move with the arrow keys, J to pick the last piece
bug CS-16232: For volumes created from snapshot, create usage event after successful volume
status CS-16232: resolved fixed
reviewed-by: Nitin
Fix: CS-15398 fix for basic zone dns issue in multiple pods
cloudstack UI - listView widget - keep advanced search criteria when scrolling down grid when the last search is from advanced search dialog.
CS-12407: F5 & Netscaler  when dedicated is selected  capacity field should be disabled.
Merge branch 'ui-fixes' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into ui-fixes
add icon for windows
update to work with new pyfixation package and log new calibration results
ライブラリ等基本ファイル群追加
Git-plugin: Set branch to commit_short if no branch is found
Manager kann jetzt theoretisch Kernels ausführen
solved 24 and 25
Final fix for news
--> Style update
Issue 3192: Fixing remaining 'Comments' to 'Comment Thread' labels.
Issue 3221 adding caution style to wrangling canonical syn warning
DRY fixes.
TD to DT
Merge pull request #763 from scottsds/issue_3192

Issue 3192: Fixing remaining 'Comments' to 'Comment Thread' labels.
Issue 3221 adding caution style to wrangling canonical syn warning
Update branch
Merge pull request #779 from sarken/issue_3221

Issue 3221 adding caution style to wrangling canonical syn warning
contact avatar
fixed bug #508: showed pager previous if number of numTotalCollections < numResults && numTotalObjects > numResults
styling changes for the account settings page
Now using relatedMatch as things were getting out of hand
Update content/guides/metrics.html

Missing `@` in Python decorator in Tags section
Merge pull request #40 from dcrosta/patch-1

Update content/guides/metrics.html
Updated the README with text.
Added more text.
Changed UniID in UniversityModule. but it's not very cool. The calculations already exists in UniversityManager.
mini hotfix. sry
moved XmlSerializer into the correct namespace :)
change made to imgutil that appeared when switching to ubunutu
added dark row column subtraction and test script
script edited and new dir for images added
img loading with gray conversion and new subtraction methods available
Merge branch 'master' of github.com:DayStar1/DataAnalysis
SelectorList type bug on append fixed
fixed an issue in marker zindex detection.
some more compatibility fixes to latest catalog trunk
Start using animations again
Get animations working
Merge remote-tracking branch 'refs/remotes/origin/master'
Make into a library project
Add NineOldAndroids dependency
Use NineOldAndroids instead of HC animation apis
second commit, testing git
fix the title, fix the content on edit
switching carousel
new campaign related methods
sync
static segments handling
segments handling
static segments id are int
fix return handling
campaign delete method
fix a typo
handle segmentantion (used for static ones)
typo
fix usage
Merge remote-tracking branch 'upstream/master'
use and enum to declare campaign type
Merge branch 'lusetti'
added Massimo Lusetti to the list of contributors
Revert flush default to len(mem)
Merge pull request #18 from Elvis-Zhou/master

修改mysql插入，添加异常处理 denied information not fixed
.
fixed `denied' prob
fixed `denied' prob
please do not use chinese characters in file names!
aaa
Merge branch 'master' of https://github.com/mad4alcohol/SoqiSpider.git

Conflicts:
	.idea/workspace.xml
v2.6
change the output of excel
changed read me
added model for key and scale
added model for key and scale
added new images
added model for key and scale
new model
new model
new model
added icon
added icon
Integration test for Engine with Connection
added option 'angleBgCircle' || default = false

'angleBgCircle' show a full circle background when 'angleArc' is less
than 360 degrees.
Puppet supports runit provider, why not use it?
portada CLUE
ng

qw
Added first WatiN test.
FS-4066 --resolve pidf and its many varieties FTW
doh
FS-4104 --resolve
FS-4105 --resolve
libzrtp: add acinclude.m4 file with AX_PREFIX_CONFIG_H macro
FS-4067
fix bad return vals on sending messages when under stress
fix mutex to work better
Handle routing loop detection properly so that the delivery confirmation handling is more accurate.
added usage and configuration example to README
不要ファイルを削除　18章完了
Add basic support for Objective-C boxed expressions.
Add options: sp_before_oc_dict_colon and sp_after_oc_dict_colon
Merge remote-tracking branch 'remotes/bengardner/master' into merge_old_work

Conflicts:
	src/punctuators.h
	src/token_names.h
	src/uncrustify_types.h
Adds copyright information
Merge branch 'master' of https://github.com/Gi-lo/CKCrashReporter
add auth token index to users
add check for authentication token to api
ResourceBase with Graphity-specific behaviour extends plain LDPResource
add Template example
drop table if exists statements before table creation

Signed-off-by: Spyros Gasteratos <morfeas3000@gmail.com>
Removed factorial. Fixed exp2.
Removed tinder gem. It was used to call campfire api, it is not used anymore.
Removed campfire integration tasks not used anymore
Update src/mangosd/mangosd.conf.dist.in

2147483646 gold and skip cinematics on characters creation.
RottenTomatoes: Rearranged the code slightly. Fixed some additional formatting on the output. Allows for an additional argument which allows looking through all hits for a query, or well, ish.
Implemented views, model, and controller to upload mib file to file system, but routes are still not config'd properly
Update to info styles
fixed label naming typo in tests
HIP-330
Finished release v0.1.11.

# By Guy Rozendorn (3) and Arnon Yaari (1)
* release/v0.1.11:
  HIP-330
  HIP-362
  HIP-362
  empty commit after version v0.1.10
empty commit after version v0.1.11
BeatRock v2.4.3 - * Fix "GetHost" - Core *
Last commit before message
Add a title helper (chapter 4)
Disabled landscape view.
some GUI performance optimisations
First cut at a jQueryMobile version of OpenEpi
work on Scene.cpp
comment on camera.h, working on ImagePlane
changing cases and matching functions
Installed mongoose
Installed Request
Playing with Request.
Removed old main test
Comments fixed
with prefix specification
Merge remote-tracking branch 'upstreamH/master'
Files now get named hierarchicaly - in order they should be watched
second commit
Revert "second commit"

This reverts commit 37c0a53f68413145e442b205f58c2e864286301f.
Revert "Revert "second commit""

This reverts commit 3c9acd841d90146d4c082e7858b970647e600a9f.
Revert "Revert "Revert "second commit"""

This reverts commit 728b70e399ea28e3d19b9ac19307d5cab8a1a325.
Revert "Revert "Revert "Revert "second commit""""

This reverts commit cbe2535126c5cf0de2d71ddba72dbd7a37e21088.
Revert "Revert "Revert "Revert "Revert "second commit"""""

This reverts commit 00bdb248393f6db2b10c12dbbd9128bedd4cfc2a.
Revert "Revert "Revert "Revert "Revert "Revert "second commit""""""

This reverts commit d404417a1af7356d5e733cb4654d61f019e153ea.
Revert "Revert "Revert "Revert "Revert "Revert "Revert "second commit"""""""

This reverts commit 2070c71f7905c7d10c98b03477d866bce4a05802.
Chapters Completes ( Cache missing )
throttle scroll handler using underscore
Merge pull request #10 from luniki/patch-1

throttle scroll handler using underscore
Running Sequence when robot is upside down

Have code in place for sequences stored in PROGMEM that inverts it when
the robot is upside down.  Need to extend to EEPROM.  Also I hacked up
my own version of BioloidEx to have a setPose that allows me to pass in
an index instead of ID as to keep from searching every ... time.   Will
probably update other code to use this
Pypose - added a test line
dev: updated https://github.com/LimeSurvey/LimeSurvey/commit/501d7aaea7d69dc5ecf807b8c6089f513758a276 to be specific to the progressbar
Updated translation: Italian by lpittalis, lfanfoni
Updated translation: Norwegian (Bokmål) by peterhol
Updated translation: Chinese (Taiwan) (Traditional) by hinghang
Fixed issue: Invalid HTML in language changer
Message history, bugfixes in the javascript
REVERT: all BT changes
Added 'Show Image Transparency' menuitem
Initialisierung der RCP-Anwendung
Bit of refactoring. Got rid of a useless parameter in the lookUpMyLocation call.
[MK] Smaal change in building html table: no colspan 0
[MK] Change in adding coordinates to Island. In previous version the
calculation of direction as an integer could mean that different
directions (in float) gave the same (rounded) integer values
mvCentral: Do not fail hard when configuration is unavailable
upload integrated in the website, playtime converter in musique Entity
secToDuree($seconde) AND dureeToSec($string)
Added a StreamRecords Entity to store and retrieve music played in a stream.
load mongoappkit.json
LMP: add Love action into tray menu.
Merge pull request #136 from panter-dsd/master

LMP: add Love action into tray menu.
Azoth Xoox: send reg form to JID that it was fetched from.
Azoth Xoox: properly handle successful registrations.
Lastfmscrobble: Ban is added.
BanCurrentTrack is added.
Merge branch 'add_ban_to_lastfm'
Merge branch 'master' of github.com:0xd34df00d/leechcraft
LMP: set shortcut Ctrl+B for Ban action.
PlayerTab: styling.
Merge pull request #137 from panter-dsd/master

LMP: support banning.

Added Ban() method to audio scrobblers interface & implemented Ban UI in LMP.
LMP: remember last used playlist dir.
Azoth Xoox: fixed includes.
LMP: resize first column to 60% on first show.
LMP: fixed include.
Merge branch 'master' of github.com:0xd34df00d/leechcraft
LMP: async playlist load.
LMP: next track when current banned.
Merge pull request #138 from panter-dsd/master

LMP: next track when current banned.
LMP: don't double-resolve items on addition.
Corrected main timer error handling
#12 i dalje u procesu; spremno za nodejitsu (node v0.6.x)
- added "master" comment
Added a custom SOS HelpMe button with different press-states and according drawable resources.
Exchanging the drawables on state changes is accomplished via setBachground(Drawable d) what is a API Level 16 Feature.
Set element.text instead of innerHTML
Space after if
not depending upon the local files...still get files from master..
* Support for Liferay JIRA
* Added estimation for analysis completion
String.prototype manipulation was deprecated and removed since OpenLayers 2.12
Changed old mobility questionnaire content to work with current version of the questionnaire.

Still needs more work.
Vinny says I changed stuff
Merge branch 'master' of
https://cmahair@github.com/Mitsugaru/TwoDotFiveD.git

Conflicts:
	src/main/java/com/bulletphysics/demos/bsp/BspDemo.java
vinny said so
Apply negative margin approach
Full height containers using. Transitions are now clunky...
Remove jquery - not used yet
Fresh exports. Perhaps some quick debugging to follow suit.
Init calculator codebase
minor changes

adjusted deletion precidence
allowed active entities to be retrieved by child classes
Fixing a fix of a fix of a fix...
new COPYING.LIB wth correct fsf adress
dunno?
Added LevelManager.pro ImageManager.cpp/.hpp LevelManager.cpp/.hpp Tile.cpp/.hpp and main.cpp, This is all that is needed to compile the level manager
Added LevelManager.pro, LevelManager.cpp/hpp, ImageManager.cpp/hpp, Tile.cpp/hpp
Added main.cpp forgot to add it with last batch of files
Deleted sTile.hpp it was no longer used and replaced with the Tile class
Deleted FileManager class and Globals header file. Neither were being used any longer
Deleted the branches folder was a mistake and not needed
Added some imformation to the readme file
Added the data folder for the pull
ARM: zImage: __armv3_mpu_cache_flush: respect should-be-zero
Version 5.2.3.38
solve another conflict
return previous scss/css
Merge branch 'master' of https://github.com/OShalakhin/quester-me
user authenticated improvement
Planning solution.
libaacs : update to 0.5.0
xf86-video-intel : update to 2.20.06
glew : update to 1.90
libbluray : update to 0.2.3
Fix the version number under maven
reorder log information
[PLAT-2357] Remove error from previous commit.
Renamed com.opengamma.integration.tool.timeseries -> com.opengamma.integration.tool.marketdata, moved PortfolioHtsResolverTool and CurveHtsResolverTool to it, and updated affected scripts.
Revert "Renamed com.opengamma.integration.tool.timeseries -> com.opengamma.integration.tool.marketdata, moved PortfolioHtsResolverTool and CurveHtsResolverTool to it, and updated affected scripts."

This reverts commit aecbc2905d42ed425f8c5774b920f86b7092afb3.
warn-logback should default to warning level.
Should use join, not "wait" to wait for thread completion.
Arrays.asList cannot have elements removed from its iterator.
Restart computation job when resuming a running view process.
Removed redundant 'if'
Added some comments, reordered methods
add portfolio with mixed asset classes to examples
[PLAT-1900] Adding bond future options.
Added AUD rate futures conventions.
[PLAT-1904] Expose the graph builder's cancelation mechanism to computation job
When reinitializing function repository after configuration change don't discard statically initialised functions.
Corrected a speling error in a value requirement name.
New db schema version for engine, portfolio, position and security to fix field name collisions with SQL Server keywords
FUNCTION and KEY. Updating SQL creation and migration scripts for HSQL and Postgres and the relevant field name references
in ElSql bundles.

Conflicts (resolved):

	projects/OG-MasterDB/src/com/opengamma/masterdb/engine/stats/DbFunctionCostsMaster.elsql
Merge branch 'develop' of github.com:/OpenGamma/OG-Platform into develop
Fixed indentation error
Removed index creation line as postgres keeps the old index even when changing a field name
Removed index creation line as hsqldb also keeps the old index even when changing a field name
Error in field name
[PLAT-2786] Cleaned provider to have simlar interfaces. Standardize the parameter sensitivity calculators.
native loader fix
Integrated the Obligor class into the CDS valuation and calibration model and test cases
fixing bad conflict resolve
adding docs
resetting unselected options
Updated leading dim comment so it's correct
[PLAT-2516] Ongoing composite market data
[PLAT-2500] Composite snapshot queries provider for subscriptions when needed
update!
add many nyaa
Adding a link to the twitter page.
Corrected format for sources comment to show in Software Sources
Merge pull request #21 from gontadu/master

Format correction
Fixed download from edelivery.oracle.com, closes #13. Fixed rebuilding behaviour. Fixed apt sources format.
Fixed download from edelivery.oracle.com, closes #13. Fixed rebuilding behaviour. Fixed apt sources format.
Merge branch 'master' of github.com:flexiondotorg/oab-java6
v0.2.0
Corrected again due to error
Merge pull request #26 from gontadu/master

Format correction
change pattern to "new" oracle.com URLs
Merge pull request #29 from onlymostlydead/master

Downloads from oracle.com failing again
Readying for 0.2.1
Merge branch 'master' of github.com:flexiondotorg/oab-java6
0.2.1 - closes #28. close #22.
Improving the tilset loader
updated target dir in composer
Refactor: inlined ensureUnitspaceMatchWith

It was only called once, and it seems cleaner to not have it attached to
the prototype if it's not necessary.
UnitValue prototype cleaner; no more unitSpace

UnitValue did have its unitSpace attached to its prototype so that it
could check that instances from different UnitSpaces did not interact.
That is not actually necessary, though; it does just as well to check that
the two functions of the same name (I used 'as') on the two UnitValues
match.

Now only things that the module user ought to use are part of UnitValues'
prototypes.
updated local file which will find by "key"; also updated corresponding specs
update files_version using "key"
update file_version using "key"
Fixing Game Over and Title mobile screens
Info about a script
Update: Suppress error message for device creation

2>&1 is the standard way for bash
Merge remote-tracking branch 'upstream/master'
Update Suppress error message code
[-] FO: Availability was not displayed anymore on product listing #PSCFV-5698
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
//small variable name fix
2012-11-06_usuario casi terminado
Recolorized
testEight works
bugfix: %GPASS% dictionary markers were ignored

cookOptgroups: use of execGMarker
recheck distance for delayed spells at hit v0.4
https://github.com/mangosR2/mangos/commit/df6fef0a53fe08723ad99083448930a48504c1e2
restore armory
Fix warnings found by analyzer in ZBS
v.3.0.3.17
Updating to the new SDK preview version
FAISSSS
[osx] never ref /opt
[osx/bsd] fixed, _LINUX is special it means all non-windows
get the add-on's XBMC_PVR_MIN_API_VERSION value to check compatibility. each PVR add-on needs to implement const char* GetMininumPVRAPIVersion(void)
configure: developer convenience - copy addons to xbmcs addons dir if
building in xbmc tree
Merge pull request #15 from wsnipex/intree

configure: developer convenience - copy addons to xbmcs addons dir if building in xbmc tree
windows: add support for downloading curl as build dependency
njoy pvr addon: add Windows build support
Add jsoncpp library. Needed for the ForTheRecord pvr addon
Add ForTheRecord Argus pvr addon (v0.0.1.141)
Windows: name the VS2010 projects after the addon name (format: pvr.addonname)
Merge pull request #16 from margro/njoy_win32

Windows: build dependencies and NJoy for Windows
Merge pull request #17 from margro/fortherecord

Fortherecord pvr addon
fixup addons/Makefile.include.am after 888580ed65a45cc92735896bede69d43bc53a0ec. targets can only be defined once
fortherecord: fixed add-on name in addon.xml on linux/osx
clean up lib extension name, add script to fix internal dylib paths (work in progress)
[buildsys] - add bootstrap
Merge pull request #18 from davilla/master

some osx fixes. 
fortherecord: fix live tv/recording playback on Windows
TSREADER define was missing
Merge pull request #19 from margro/fortherecord-fix

fortherecord: fix live tv/recording playback on Windows
don't call AC_CHECK_FILE when (maybe) cross-compiling. thanks @sraue for the pointer
added equals test for QueryRule, deleted a non working variable called 'or'
change Main.hs to just print command to be executed (not actually running them) and add btrsync.sh which actually properly run these commands\nupdate .gitignore
Get build system to work with Make 3.82

Note: `sort` can't seem to handle newlines in 3.82.

Change-Id: Ieeaee1d19688688a02e396bbc5b4dea26e7f6943
Signed-off-by: Jim Huang <jserv@0xlab.org>
Se agregaron los campos faltantes en Cuotas
removed grid bg
Changed read-me file for test
Modified: .gitignore
Merge branch 'master' of https://github.com/Sa-ryong/landing_page
Added: i18n basic support
changed pausescene item padding
c2nim generated turbojpeg wrapper
Add extra nativeSpecification arguments if present in platform_args
Add extra args to command line; all arguments passed will be submitted to drmaa
Merge branch 'hotfix/extra_platform_args'
Merge pull request #69 from percyfal/master

Hotfix - add extra args for drmaa
fix transport logging
step
step (in auralpresentation impl now)
step
that's why we need named arguments for extractors...
Little grammar changes.
LogUpdate
Add rudimentary find/replace dialog
Merge branch 'master' of github.com:ShadowKyogre/mikidown
Use Qt's print dialog to allow printing out to a real printer AND setting some options for printing
Add comments to SystemUiController.cpp
Polish up ScreenEdgeSlideGestureRecognizer.cpp

Change scenePos into screenPos, remove some redundant checks, add
comments.
Updated signalr.
Adding framework target to MGTemplateEngine
fixed framework target
Fixed dynlib install name for framework.
Use @rpath for framework target

To use as framework set LD_RUNPATH_SEARCH_PATHS = @load_path/Versions/A/Frameworks @executable_path/../Frameworks in the final application no matter how deeply nested this framework is.
Updating INSTALL_PATH
Updating project to LLVM (Mac only) according to Xcode recommendations
Support for detecting NSNull and zero length NSStrings as false
Fix for bug in IF_START handling that meant {% if not condition %} didn't work
Merge pull request #1 from glencoates/master

Couple bugfixes for the template library
LastUpgradeCheck is now at 420
Hard coding ARCHS to armv6 armv7
Remove some analyzer warnings.
XCode 4.3 upgrade check & turning off thumb
Xcode 4.5 project validation
Merge remote-tracking branch 'upstream/master'

Conflicts:
	MGTemplateStandardMarkers.m
passing classname from plist
update connect and express versions
- Added HTTP header checks to CreeperRepo urls, then failover to alternative source.
Merge branch 'master' of https://github.com/PaulTT88/FTBLaunch
Merge pull request #418 from PaulTT88/master

HTTP Headers Check
correct a prefix
extra pca
fixed bug in nodejs error object handling
added chapter 2 example
Error correction and GUI improvements
fix updating userinfo bug
Fix to #1999 and a change to the fix for #2005

-Fixed the atmos alarm, don't know why this is giving me so many lines added/removed. Only removed the alarm, added another on the tile below, and change the Y location.

-Commented variable rendered unusable by commenting that check on my other fix. Forgot about that >.<
tentative nouveaux boutons. + nouveau système de propulsion.
Added Windows 7 GG2 screenshot
cleaned up sum shtuff. =)
missed a few from last
single arg dummy user constructor
read in course history data
add submodules, all perms & vars
Primera etapa de edicion de proyectos, todavia no impacta las actualizaciones pero si recupera los campos
Moet nog wat testen
0.I.3 threshold
allowing apk files to be uploaded
uploading the APK
Sources created
Bugfix in DBFileItemRepository.php
Checking choosen value
lllllllll
lyv
jiemian
Merge branch 'mxp10.24wan'
cleaned up trivial_gp.rb example
various small messages
caught some bugs in List#infold_up and List#infold_down
stripped out Interpreter#trace_string infrastructure
Item#size counts content sizes nondestructively, [Closures pending]
bug involving Proxy#^rescript
various Proxy messages cleaned up
lock-in before rewriting Closure class
cleaning up some chaff from last attention day
fiddling with leftover changes
So far from a functionnal app...

- Simplify Storyboard
- Downloader create objects that are not inserted in cache
- Manager will handle both download and cache elements, it should be
the only entry point to get elements
next command is implemented.
Make install-prereqs idempotent
Save head much earlier
test mySQL connection
sample data media for vendor

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@6144 87cc427b-4a1e-0410-b729-b2260ec0f063
login in checkout was not working, fixed

git-svn-id: https://dev.virtuemart.net/svn/virtuemart/trunk/virtuemart@6145 87cc427b-4a1e-0410-b729-b2260ec0f063
GitHub: add repository
GitHub: fix namespace
GitHub: add author
:-p
change in the profile information and message functionality
Add easyblog UI and change the way of selecting k2 category & tag
registration form working!
Added Plugin for User points functionality
Revert "Added Plugin for User points functionality"

This reverts commit b51a190bcbbb227e8873c14c8a73cdb23e0838dc.
Added Plugin for User points functionality
correct paths for stylus
Modified the pipeline test
mantis diocese #0006399, bug cas

Lors d'une connexion en mode SSO avec CAS, le menu backoffice initial est errone.
Pas de trou de securite mais un environnement inadape
Merge branch '8.1' of https://github.com/XSALTO/console-seolan into 8.1
Add an Async event for prevent Faction chat usage
Teach new single and EdgeTools to return structure_id
One more assert..
__all__ cleanup
readme update
refactored shogiboards to shogiboard
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/shogiboard/index-2.html
	images/shogiboard/index.html
	images/shogiboard/koma.html
	images/shogiboard/masu.html
	images/shogiboard/sample.html
	images/shogiboard/vector.html
	images/shogiboard/vector/kinki_vector.ai
	images/shogiboard/vector/kinki_vector.html
	readme.txt
Added act and scene to cues
Resolved merge conflicts
inicio
p
Merge branch 'master' of github.com:abelardo6/despachoApp
Added attribution setting
Move ruby-ldap and net-ldap dependencies from gemspec to Gemfile
NFA
Added Dfa
updated dao and ingestors
updated test
added publication filtering
lots of small changes
workspace file
Version 0.1.0
Merge branch 'release/0.1.0' into develop
Authentication type renaming
Merge branch 'refactor'
fixed display mult scrollbutton appearance after closeing
fixing up some formatting for the sidebar
Network messages updated.
merge grande de niquito ;)
Submitting AVF Folder
Changed structure of the files.
added import to __init__.py
Finished restructurisation. Added .gitignore
Merge pull request #1 from alekzvik/master

Changed structure of files
Ignore Mercurial and Ant files
Ignore .hgignore; changed version of flash-player at build.xml
Fixed styling of back to search button.
Merge pull request #191 from akloboucnik/bug-184

Fixed styling of back to search button
Adds validations and relations in Models Lightbulb and Profile
Adds Lightbulb controller
Fixes wrong naming convention on schema
Adds functionality and view to Lightbulb
Adds create in Lightbulb Controller
Adds gravatar
disable compression of assets in production
Signed-off-by: Gokeii <21250546@qq.com>
Merge branch 'master' of https://github.com/albusshin/SVRPlatform.git
defined service interface

Signed-off-by: Gokeii <21250546@qq.com>
Merge branch 'master' of https://github.com/albusshin/SVRPlatform.git
Signed-off-by: Gokeii <21250546@qq.com>
Signed-off-by: Gokeii <21250546@qq.com>
Merge branch 'master' of https://github.com/albusshin/SVRPlatform.git

Conflicts:
	build/classes/applicationContext.xml
	build/classes/com/SVRPlatform/action/Index.class
	build/classes/com/SVRPlatform/action/SubmitBug.class
	build/classes/struts.xml
	src/applicationContext.xml
	src/struts.xml

Signed-off-by: Gokeii <21250546@qq.com>
Signed-off-by: Gokeii <21250546@qq.com>
Merge branch 'master' of https://github.com/albusshin/SVRPlatform.git

Conflicts:
	build/classes/com/SVRPlatform/dao/impl/UserDAOImpl.class

Signed-off-by: Gokeii <21250546@qq.com>
update tool box templates
add pixastic js library
add pixastic and thumbExtractor to prod application
add thumb extractor library
add thumb extractor icons
add thumb extractor css
add data-uri dependency
add thumb extractor routes ( apply new thumbnail & confirm box)
fix typo
Merge branch 'Dev' of github.com:alchemy-fr/Phraseanet into tools_refactor
delete chgthumb, newimg, rotate, img function, chgdocument files
add new task menu item
modify "add new ..." menu item wording, modify translation file too
Merge pull request #41 from dougle/master

add "add earlier activity" to the dropdown menu
the stop tracking time was not dealing well with timezones
on restart also carry tags
hello changes
pushin' to extensions
Add support for Gnome 3.6.

  * Add support for 3.6 in metadata.json.
  * Change symbolic icon support.
  * Updates to new way of adding items to panel.
Merge pull request #44 from martey/gnome-3.6

Add support for Gnome 3.6. Fixes #43.
fix the placement for 3.6 and drop support for 3.4

the code to support the deviations between shell versions
is quickly getting out of hand and tricky to maintain
pushing to e.g.o
nyah, forgot to drop 3.4 support from metadata
properly kill the refresh timeout on disable. tip by gcampax
mixed up params
update the meta again for push
Added french translation
Merge pull request #46 from rdoursenaud/master

French translation
Concept: Insert applet left

Replaces the "Activities" text. The hot corner is still there, it's text
is just hidden.
Load default session in absence of session name

The `turses.session.Session.populate` method accepts a
`turses.models.TimelineList` and a session name as a parameter and populates
the timeline list with the timelines defined in the corresponding section of
the sessions file. When no `session` parameter is provided, the default
timelines will be populated.

I've defined the `turses.session.TimelineFactory` class that is able to create
timelines when a name is provided. This class encapsulates the parsing of
timeline names and creation of timelines with the corresponding update
function.`

The `turses.session.clean_timeline_list_string` method accepts a string of
comma-separated timeline names and returns a list of *cleaned* names (i.e. with
the whitespace stripped).

Apart from that, I've written a docstring describing how the sessions are
declared and loaded. The implementation is not finished yet though.
Make `turses.session.TimelineFactory` callable

Instead of having a `create` method, the instances are now callable.
Load custom sessions
Inject the model as a dependency to the Controller
Command-line flags to specify the session

Now, the information with the session we want to load is stored in the
`turses.config.configuration` Singleton.
Support for search timelines in sessions
cleanded up the JTree situation and put it in its own subclass
Add half an android and cylinders
Merge branch 'master' of github.com:alexnixon/RaytraceClj
fixed agent farm nimbus script (deploy + jboss restart)
less verbosity in production
FIXED SOMEHING
NullObject returns itself by default
card_new: cardNumber check add JCB
2/11/2012
Merge branch 'master' of https://github.com/tigeralpha/pamdental into tigeralpha-master

Conflicts:
	application/controllers/dentist.php
	application/controllers/patient.php
	application/models/dentists.php
	application/models/patients.php
	application/views/dentist/dentist_home.php
	application/views/patient/patient_view_checkup.php
AV-2/11/2012-6:36PM
AV-2/11/2012-9:56PM
------------------------------------------------------------
Merged code with tigeralpha

CONFLICT: ./application/controllers/dentist.php [RESOLVED]
------------------------------------------------------------
AV-3/11/2012-4:13PM
AV-3/11/2012-9:56PM
---------------------------------------------
Just on time for CID on Sony, Daya rocks :)
---------------------------------------------
AV-4/11/2012-4:39AM
AV-4/11/2012-6:28PM
AV-5/11/2012-12:53PM
Merge pull request #31 from alphavictor/tigeralpha-master

AV-PULL-5/11/2012-12:55PM
* Removed debug statements

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@22946 3ad0048d-3df7-0310-abae-a5850022a9f2
* make use_fixed_stack for i386 more generic (any target with more than
    4 byte stack alignment needs a fixed stack)


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23043 3ad0048d-3df7-0310-abae-a5850022a9f2
  * prevent invalid typecast on targets using nestedfpstruct functionality
    in case of type errors in the source (the compiler will already have
    printed an error at this point)


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23044 3ad0048d-3df7-0310-abae-a5850022a9f2
added templates for new form types
added create and update methods to database class
Fix README for most stable release version
Update readme
Merge branch 'master' of github.com:anders88/sweeper_game
Ripped out DB migrations. It´s better left to the application itself.
Added functions from AntiORM
Added tests for functions
Added compact filter and tests
Fixed comments by Andi
Merge branch 'master' into antiorm

Conflicts:
	sqlparse/filters.py
Fixed regression thanks to idea from functools.lru_cache()
Merge pull request #69 from piranna/antiorm

Antiorm
selector: standard return value for commit fct (ae)
Bug #28 fixed
Database files cleanup
Database Files cleaned
Explicit conversion in element on flood scan
gitignore, cleaned up matlab function
Piece movement and rotation
initial commit, setting up Jekyll
atom feed
start importing content and configuring jekyll
added missing boolean check to conquer up.
Adding concept of sessions. 

Now two machines can play the demo.
SEXY RUSSIAN LICENSES FOR YOUR #69 FIX PLEEASURES
Merge pull request #70 from ProLoser/master

Sick man, sick.
Fixed start date timezone

Fixed the method to convert the start date to PayPal's format: The time is now correctly converted to UTC (Zulu). Previously the timezone information was lost leading to wrong start dates.
pas de future mise en place d'options d'affichage pour ce script --> juste un allègement
tooltip work
Merge branch 'master' of https://github.com/anstosa/AngelHack2012
Merge branch 'master' of https://github.com/anstosa/AngelHack2012
Reichardt function now returns LP filtered components for purposes of debugging
Revert "Reichardt function now returns LP filtered components for purposes of debugging"

This reverts commit 245485e8ae12833a715b0d2afb4138a514c1591e.
Revert "Revert "Reichardt function now returns LP filtered components for purposes of debugging""

This reverts commit a4ef8f6a85123902f24aec3612d29723b621edcf.
Repair broken summing in RD basis
Add tau dependency and current RD basis return structure to sine RD
Implement basis/sine RD demonstrations
fixed google web search requests
added new files to compile into library
Split the main org in multiple org mode files.
improve tags and category
minor formatting.
programming in haskell - draft.
Format.
Formatting.
Enabling install of vim-fugitive
initial commit
Merge branch 'master' of github.com:arnijohnsen/cudatests
set python tabs to 4 spaces
[test] removed add to testruner
Fixed navigation links with interim fix
Backported changes from master about improved health probes.
m_delaymsg Don't bother with remote users
Fix a bug with the input hack where if a page was cookie locked, and then redirected, it would fail to display the page next time the page was requested.
v0.09

    - CPAN RT #78029: fix a memory leak reported by Norbert
      Buchmüller.
Added basics of web programming
Added constructor Location(Map, String)
Make TalkingState private to DefaultGameModel.
pulled latest graphics_submodule changes
work with active_model_serializers
Modify badges.js to return if we get to the default case in the
switch handler of enableOrDisable function. Should never get there
theoretically since we will always have one of the three states.
Merge remote-tracking branch 'origin/feature_1' into feature_1
Add calendar segment

Fix indentation
version 2 works but produce bad results
Changed placeholder images, since placehold.it doesn't work
Added cvsignore, gitconfig. In the process of moving things around.
Forgot the bashrc
Moved things around to get pathogen and fugitive to play nice with amix's things.
Ignoring the temp_dirs that are created in the vim_runtime path
Added ctags hooks to git
footer_content update request needs to have :method => :get set explicitly, to prevent it from using a post action
Merge pull request #85 from joshwlewis/footer_content

Footer content
Update notes for submitted changes

* add ability to provide options to nfs installs, also --ks-meta for workflows
Needed to update the prefs form to handle correct email validation

Change-Id: I8a9e921f355772078366018c53f12a1f649964ef
Bug: 815325
Merge "Needed to update the prefs form to handle correct email validation" into develop
Update notes for submitted changes

* use flock to prevent beaker_expire_distros cron jobs from running simultaneously
Define PC class (program counter)
Revert "made some changes to the custom css"

This reverts commit be061ce452b81f9c1af5b8e383c289b30ae791c1.
just wanted to change the css

not the html - I'll leave all those divs in there.
passing update results
Some minor fixes to an unused file
Improvements to HTML conversion, made toDOM and toHTML for knodes be the same
updated event.php to use datatables
Merge remote-tracking branch 'origin/master'
Allowed mirah to be invoked from jar file & (temporarily) fixed bug in MirahFile target's output identification. Created distinction between file targets that do not get copied to output & targets that do.
fixed is_tablet_device method
Merge pull request #25 from noctivityinc/master

Fixed is_tablet_device? to work with Ruby 1.9.3
Revert "Fuck"

This reverts commit 64847c9f1816bde0e6a8ecda406a4adae7bd6fb4.
add memcache import
Changed keep inventory default to false
Fixed permissions and improved the method sig. and javadocs
Removed pointtobase function

Signed-off-by: berger killer <bergerkiller@gmail.com>
IMPORTANT SAFTEY FIX: Excluded SOS mode from 10 minute automatic power down, remove redundant SOS mode time
Placing a cap of 65 frames per second on cube results at the server.
Merge branch 'master' into presentation-2012-11-09-Demo1
Cleaned up test releases. Preapared for 0.1.0 release
Trying fetched properties
Converted to ML
Further work on chatController
Further options in preferences, fixed most ChatController flaws
Merged changes to ChatController into master
Worked out many ChatController bugs
change naming
add logger window
include jsdoc
add jsdoc
made aggl3 more robust
Actualizacion del modulo carrito
Use ffffound IDs; don't download smaller images
Updating README to match new reality
Updating README to match new reality
Note to self
updating comments
Update README.md
Merge pull request #3 from devshorts/master

updating readme
Remove branch descriptions

The branch descriptions have moved to the gh-pages branch, which contains
reproduction test cases etc.  The README now just contains a link to the
gh-pages URL.
Changed stuff so you can select pieces
Add materials from first 2 days
hotfix gameloop, watershader, controls
removing nerdtree to re-add as sub-module
Re-adding as sub-module
modification du fond
modification des titres
Merge pull request #1 from DelahayeAdrienSrc1c1/master

Style vainqueur du vote
ektf2k touchscreen: fix multi-touch
Quick Fix for View All JobList
Merge remote-tracking branch 'origin/master'
db connection working
continued with db