labofsahil/github-event-dataset-2012 huggingface dataset:
add shiro
Merge remote-tracking branch 'origin/master'

Conflicts:
	pom.xml
minor update
add theme
remove unnecessary taglib
minor update
minor update
添加shiro,hibernate参考实现
添加public定义（tiles），用于非登录页面
moved jscript to seperate file
new Main, Player, SoundGenerator
impl svg basic shapes
impl svg transform
New tests for DLL loading
trying to ignore
Merge branch 'master' of https://github.com/wcpro/ScaffR
Added Msg Forwarding.
only send maintenance hello messages if you havent seen him for a while
nuevo ferdomingo
clear gh-pages
add files to gh-pages
remove png , and add executable file
...
addressing Adam's requests on the prediction plugin
bugfix for 26594427
Began work on a UI for manually inputting events for testing purposes.
return sites from wof.core.get_sites()
get rid of two abort calls
factor out the other abort calls
re-add discontinuity callback

It's now called at the start of playback. Hopefully ok even if it's the
first file.
Final Final :)
.gitignore 설정

참고:https://github.com/Machx/gitignore/blob/master/Android.gitignore
王杰：编写Model ，IDAL ，MYSQLDAL
Adding sample for enrich mediator

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@130628 a5903396-d722-0410-b921-86c7d4935375
Addding sample for enrich mediator

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@130629 a5903396-d722-0410-b921-86c7d4935375
Adding sample for enrich mediator

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@130630 a5903396-d722-0410-b921-86c7d4935375
Committing missed file

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@131500 a5903396-d722-0410-b921-86c7d4935375
added xslt files

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/commons@132552 a5903396-d722-0410-b921-86c7d4935375
Have done a beautiful (even though I say so myself) rewrite of the substitution system in Zeno such that it now freshens variables properly, and is much nicer in general.
The Substitution.Apply instance isn't finished for Term.hs yet though.
Add Command-T alternative
SRP stream detection now checks for its own stream

It was possible for xr_avb_lc_demo to try and sink its own talker stream id
because there is a period after switching one endpoint off where the talker
advertise still contains both stream ids. The ATT demo just latches onto the
first stream it sees, hence the problem.
Update documentation
Add benchmark code
set up over test
Fixed bug on some links having double slashes causing bad urls being crawled. created a method to sanitize uris and add a trailing slash when it's needed
Better show the usage of setActivationState
Cleaner and less forking implementation of zsh.d
Initial Commit
CSS
CSS
CSS 2
CSS
More CSS
extra stuff?
Updated doxygen for ' f1834eb Png pictures for dots ' build 452
Merge pull request #35 from yfcai/sugarj-in-cabal

1 more executable for SugarHaskell
simplify build scripts
rm generated file
improved logging
fix NPE
parse verbosity from command line
better message
improve logging
filtering IOAgent to filter logging of sdf tools
logging level overwrites filtering
describe nature of cabal package
Merge remote-tracking branch 'upstream/master'
Java 1.6 -> 1.7 because of driver.ModuleSystemCommands.java:229
added blank rspec.rake
superficially working RFC6455 WebSocket
start prac
Add RC-versions
Alternative UI prototype with xui.js/iScroll and custom CSS
Decided to distribute Cog under LGPL license

So I changed the license in this commit. Since I'm the owner of this
code, I can do whatever the fuck I want with it! Nyah!

My reasoning is because I want cog to be used similar to that of a
Library (in that users will build off of this work), it would be better
to be a bit more permissive with my work. If you have a problem with it,
tough shit.
menu translation added; routes fixed; error page in english done
minor display changes to favorites activity
changed binding for include, fixes for groups, refactoring, documentation, tests
Update comment to include the buggy version
Abstract 3 float setter
Add binding for velocity
Shorten Win32API object names to match seal API
Add orientation binding
doc update
stop distribute r123

the newly released 1.07 has included my patch, this distribute is no
longer needed
修改了生成doordomain.ftl模板
用户管理
网站配置
网站配置
网站配置
网站配置
网站配置
变更日志
代码生成器生成控制层
代码生成器路径整改，主要通过包进行解析路径
代码生成器路径整改，主要通过包进行解析路径
代码生成器路径整改，web相关模板，包括js,jsp，controller
代码生成器路径整改，web相关模板，新增页面和更新页面功能模板
代码生成器路径整改，web相关模板，新增页面和更新页面,详情等功能模板
基类增加jdbcTemplate
mybatis增加.ext.xml扩展文件
日志填写
配置修改
脚本命名规范
脚本命名规范
调整radio结构
Untabify Texture.cs
add provides and conflicts
add func _my_install_symlink_script
JavaScript code for PE problem 237 added.
Level 7.
path check for tracker_token in a better way
Add pagination to features index page
Add pagination to features index page
navigator doesn't exist since we're not in the browser
Removed temporary write statement
added cancel button to attribute selection dialog
Removed list of disabled tests from standard test suite - it is not really a quality measure and can still be listed using the target: make disabled_tests
[BACKPORT] Fix closes #397 subcategory should be road not roads
README update and tidyups
Merged from local 1 0 0 branch and resolved merge conflicts
Add missing include
Keep compatibility with older ogre
Integrations::Workflow.integrate now optionally resets the catalogs.
Small fixes in comments and 'clar_status.html'
Adapt to the latest changes
Link AXR dynamically from a shared object
Use boost::lexical_cast to log HSSUnits coming from functions in HSSLog
Fixed skills getting mixed with attributes in the database.

* Server maintainer should check their db and clean it if nessecary *
tc corregido
Started working on orb death.
Fix add/update own exercise and show own exercise.
Removed unnecessary line height styling from the default theme.
test log page
remove blank spaces before the first log line
test

test
delimgs
update
update&statistics
update config
delete default image
update
update
update
Merge branch 'master' of github.com:Aulust/adshow

Conflicts:
	config/config.ex
	db/install.sql
Update statistics
add 1st help line to csv
image upload & fixes
update statistic
update
test
test
Revert "test"

This reverts commit e9bd8b4a7a1368e863936311b6ce2925ffd796ba.
add statistics and image upload
add statistics and image upload
[demo] demo注释 example 补全
Merge pull request #160 from pengzhanlee/dev

[demo] demo注释 example 补全
[FIX] XQuery Test Suite drivers updated
Actually moved some things into packages
Added a view of sorts
Fixed some view stuff
Start of parallax
Image cache is weirdly broke, so never mind that.
Derped the parallax factor
Added a second ship because fuck yeah
Parallax scrolling w/ chinced math
Added a few more ships because metal man
Made the ships different colors
Added another layer to THE PARALLAXOR
Fixed incorrect update name
Core/Player: Check coords before saving BG entry point
Merge branch 'master' of git://github.com/ProjectSkyfire/SkyFireEMU
Fixed Gilneas crash.
The issue was caused because of aPlayer point not being correctly initialized with NULL value at script object creation and therefore has random value.
Later on when we use that point we do not know if it points to a valid Player object or not.
Merge pull request #715 from DimitarKrastev/master

Gilneas crashfix
Merge pull request #568 from roc13x/master

Fix possible crash from BG entry point
Core/Misc:

* Attemp to fix (or at least workaround) a bunch of crashs. (the Achievement one isnt from me, dont remember the author name)
* Fixed hunter's talent serpent spread.
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
Core/Opcode: Corrected 2 opcodes.
- If opcode has a NULL handler, the status for it should be never.

Signed-off-by: bootz <bootz@projectskyfire.org>
DB/Quests: Add quest support for worgen and goblin dk's for quest "A Special Surprise".
Merge branch 'master' of github.com:ProjectSkyfire/SkyFireEMU
DB/Gameobjects: Fixed some wrong data on death knight's Death Gate and fixed the position of cities portals on Acherus, DK's should be able to fully complete the chain quests again.
Core/Battlegrounds: Fixed BG queues, you may now queue up again for bgs, (thanks oneb1t for spotting bootz derpiness, lol)
Core/Player: Le missing variable initialization.
Core/Player: Implemented rune regen speed mod based on haste rating amount and haste auras. Patch from TC 4.3.4 branch.
DB: Quest fix 27671 and fixed flags for TAD
-   (http://www.wowpedia.org/Quest:See_to_the_Survivors)
-   (http://www.wowpedia.org/Target_Acquisition_Device)
thanks to: Giliak

Signed-off-by: bootz <bootz@projectskyfire.org>
DB: Added two missing strings
- this clears two errors out of the console from plyer loggin

Signed-off-by: bootz <bootz@projectskyfire.org>
Added remaining missing strings and missing texts for BF_TB

Signed-off-by: bootz <bootz@projectskyfire.org>
Core/Scripts: Spell Codestyle cleanup.

-   Trimmed trailing spaces
-   Redundant extra line spacing
-   Tabs2spaces

Signed-off-by: bootz <bootz@projectskyfire.org>
DB: Added tp/bg to battlegrounds.
nice catch Greymane ;)

Signed-off-by: bootz <bootz@projectskyfire.org>
DB: fixed movements for TAD's

Signed-off-by: bootz <bootz@projectskyfire.org>
Added plugin settings support
Modified post_syncdb hook for creating table analytics_satisfaction
(Issue #11)
Merge branch 'issue11' into develop
Add useful macros, camera functions etc..
Add public camera functions etc..
Get rid of useless stuff, use the free macro
Modify code to use help macros
Provide default projection when no camera, resize -> viewport
Use help macros, check if transformation is same
Resize -> viewport, etc
Add camera.c to cmakelists
Use help macros
This function doesn't need a return value
Add todo, new channels and make debug print use _glhckPuts
Update kazmath
Add camera.c
Add option to compile kazmath with floating point and make it default
Fix camera stack update code
Add camera stack releasing code
Add kazmath float definition and camera stack release function
Add ifdefs for floating and double precision kazmath paths
Release camera stack on terminate, decrease default far projection
Give default projection function width height argument, update
dimensions to library last.
creado bundle del juego
Update submodules: plugins (new commits)

plugins:
    75b000c Chris Northwood <chrisn@dmdirc.com>
            Add command to bounce dock icon on OSX

            Gerrit: http://gerrit.dmdirc.com/2569

Change-Id: I70ff0812b15d47c0c158f7d53d45b905ccd8c40f
Being picky

:P
QUASAR: Comment out segfault debugging code in main.js
tweaks to game block, for offline testing
Strandtest from cjbaar
Scoped modifiziert
Some GUI updates
Merge branch 'master' of github.com:Dimappers/Pub

Conflicts:
	Source/App/src/dimappers/android/pub/Organise.java
Visiškas perdarymas.
added title
added content
move check for path existence into GET handler
read POST from user
configd: parse available properties from procfs

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
configd: find properties for socket

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
configd: minor update

Signed-off-by: Daniel Borkmann <borkmann@iogearbox.net>
Tested with IE10
additional changes for strategic DSS
latex changes and implementation document
using itrace.as to do flex client debugging, as the trace() won't shown up

Signed-off-by: Eko Suprapto Wibowo <swdev.bali@gmail.com>
Fix two "skiping" typo.
ffprobe: rework checking logic in writer_print_time() and writer_print_rational()

Make writer_print_time() and writer_print_rational() always call
writer_print_int() or writer_print_string(). This way the checks for
determining if the value should be printed or not are consistently
performed in the low level functions.

writer_print_rational() is moved downward in order to avoid a forward
reference.

Simplify/amend the overall logic.
ffprobe: reindent after previous commit
ffprobe: drop pointless opaque parameter in writer init callback

The parameter was never used.
Updated documentation to handle the refactoring of QuiltProtocol
fixed: cropimage icon not always correctly appearing
language translations
Update components/com_fabrik/sef_ext/com_fabrik.php
Merge pull request #496 from jfquestiaux/master

Correction for the sh404SEF plugin so the slug is correctly picked up by the plugin
$status class var in form session needs to be public.  fixes #481
curvnol
log_workout

added customize button
main, strings

added support string for log_workout. added margins in main on sl
button.
Customize.xml

Added icons
Neuwied is not in Hesse anymore...
still use static MySQL password for gemeinschaft for now
Listes d'amis fonctionnelles
Upgrade to reducers@2.0 reducible@1.0 replace
Replace local utils with functional and oops
Update to sync with reducers changes.
add ptp
update README
Merge new and new_child actions

The only difference between these actions is 1 line.
If creating a new child task becomes more complicated we can put this
back, just have to remove the :action from the route definition.
Make cucumber pass and add some wip cukes
Fix a critical crashing issue.
Highlight quest items on loot frame.
Fix the minimap queue button.
Fix auto BoP loot pickup when solo.
Fixed to quest frame.
Finally fix the stance bar (thanks Tukz).
Fix a bug with the micro menu.
fix `alias_attribute` will raise a syntax error if make an alias on a
column that named as a ruby keyword
remove useless tests for Range#step
Merge pull request #6308 from nashby/blockless-step

remove useless tests for Range#step
adding examples to Hash#deep_merge method
added example to Hash#stringify_keys
unnecessary 'examples' noise in Hash#assert_valid_keys docs
added example to Hash#symbolize_keys
use const_defined? with second argument in AS::Dependencies

there is no need in local_const_defined? helper method
marking self in Hash#symbolize_keys!
Autoload ActionDispatch::Request::Session to avoid circular require.
Merge pull request #6307 from oscardelben/refactor_app_generator_test

Refactor App Generator Test
Briefly explain static file routing in the getting started guide
Re-enforce/re-explain what happens when you go to root route (Welcome#index) better
Separate CR out in CRUD explanation, explain each letter one at a time
Rails actually has one root route defined
Wrap 'Missing template posts/new' error message in a blockquote for better formatting
Correct code wrapping around content of welcome/index.html.erb
mispelling asset_tag_helper
Merge pull request #98 from acapilleri/mispelling_asset

mispelling asset_tag_helper
clean the erros if an object that includes validations errors is duped. Fixes #5953
Issue #7, Extending capret.js Javascript - to work with Piwik..

* Initial unmodified copy of capret.js
* https://github.com/tatemae/capret/issues/7
Issue #7, Initial modifications for capret-piwik Javascript
Bug #8, Fix for MSIE 8 in capret-piwik.js Javascript..

* Internet Explorer was not requesting the beacon GIF from Piwik on copy
* https://github.com/tatemae/capret/issues/8
Issue #7, Fixes to capret-piwik.js - so the tracking-GIF works when pasted..

* URL encode '_cvar' custom variables JSON array, url, action_name segments etc.
* Add 'copyTime' (ct) to '_cvar' custom variables,
* Tidied Javascript.
Issue #7, Numerous small fixes/ mods. to capret-piwik Javascript..

* Appending '/ CaPReT' on the Piwik action_name,
* @data-piwik-src-ref <script> attribute - switch...
* ..Switch - put 'source' URL in Piwik's 'urlref' parameter (default, 1)..
* ..Or, put source URL in Piwik 'url' parameter (0)
* Also, put source URL in '_cvar'[1] - custom variables
added nav
fixed simantics
added images
added spaces
Logikfehler behoben in Logic.cpp
Logikfehler in Logic.cpp bei Positionierung behoben
Avoid the use of the target pseudo-class
Added the docs directory
fix build; regenerate
fix deps
fix MPS-15532: wrong vfile was returned from multitabbed editor
fix MPS-16558 Cannot select "none" in the "Import Extended Languages" dialog
MPS-16627 need a way to customize context node when adding concept in right transform
MPS-16627 need a way to customize context node when adding concept in right transform: part 2 - make targetNode available in add concept handler
TRACE macro, take one #MPS-16376 in progress
TRACE macro take two: mapping label support, several output support #MPS-16376 fixed
Merge remote branch 'origin/MPS2.5'

Conflicts:
	core/generator/source_gen.caches/jetbrains/mps/generator/impl/generated
	languages/languageDesign/actions/source_gen.caches/jetbrains/mps/lang/actions/behavior/generated
	languages/languageDesign/actions/source_gen.caches/jetbrains/mps/lang/actions/editor/generated
	languages/languageDesign/actions/source_gen.caches/jetbrains/mps/lang/actions/typesystem/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/actions/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/behavior/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/constraints/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/editor/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/generator/baseLanguage/template/main/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/generator/baseLanguage/template/util/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/intentions/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/scripts/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/structure/generated
	languages/languageDesign/generator/languages/templateLanguage/source_gen.caches/jetbrains/mps/lang/generator/typesystem/generated
rebuild ide.build solution
Clean up the FindQt5Transitional file.
Fix Qt 4 build.
Calendar Events: Step One

Port of functions from LuaCalendar
Classrooms started
removed extraneous legal info
remove link colors on headers
add blurb to need form
update colspans
CMake Nightly Date Stamp
CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated comments

CONFIGURE_PACKAGE_CONFIG_FILE() now additionally generates
"Any changes to this file will be overwritten by the next CMake run
The input file was FooConfig.cmake.in"
into the configured file.

Alex
Merge topic 'ConfigHelperMinorCommentFix' into next

8039bd0 CONFIGURE_PACKAGE_CONFIG_FILE(): improve generated comments
8521a9e CMake Nightly Date Stamp
CMake Nightly Date Stamp
Automoc: get include dirs without stripping implicit include dirs off

This should finally fix #13667 and #13762.
Instead of adding special handling to guess whether implicit include dirs
may have been removed, simply make it possible to query the include dirs
without removing the implicit ones.

Alex
Merge topic 'TheRealAutomocIncludeDirFix' into next

acc2240 Automoc: get include dirs without stripping implicit include dirs off
2be87f8 CMake Nightly Date Stamp
Extend documentation for CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES

I stumbled upon this behaviour this week (a full path given
to target_link_libraries() turned into a short -lFoo when linking)
and it was quite hard to figure out what was going on.

Alex
Merge topic 'DocumentLIBRARY_PATH' into next

cc0580f Extend documentation for CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES
Update virtual/linux-sources/linux-sources-2.6.ebuild

The astrisk in the KEYWORDS was causing issues with compiling in paludis.  Simply copied over the KEYWORDS from the linux-sources-0.ebuild
Include non-minified ember library for easier debugging.
Call super when overriding methods (duh >.<)
Combination lock demo, basic design done.
Fail gracefully on 0-length files

They already have a well-known hash so we return it instead of
triggering a div-by-0 on Term::StatusLine.
Merge branch 'fix/empty_hash' of git://github.com/Kovensky/KADR
Add option to only hash found files
Update text format
Update storage account
Comments and sorting for el-get packages
ADD: options, output-formats, output-file, 32- vs. 64-Bit compile removed
Update edbus.spec
Merge remote-tracking branch 'upstream/br-1.0' into br-1.0
 optimize UI
Merge pull request #56 from welon/br-1.0

Optimize UI
1.449 changes
camera list appended
version increment; supported camera list appended
Server+Client upgedated
Merge remote-tracking branch 'origin/master'
Upated lua macros
Add a notification that the PyPal & Flattr donation page is being opened
plus possible de faire des rr quand banni
test

test from alkarps
Added Reset All button.
Code cleanup.
Style all layers button added.
Moving loading spinner to BOTTOM_CENTER.
Setting up layout. Still need to tweak some things.
Handle toggle to show and hide.
Merge pull request #157 from MapofLife/feature/rearrange-ui

Move Species List Tool Top Right
IE9 is strict with cross-site scripting, channeling json request through appengine to fix metadata popups.
add test case of is_safe in buffer test
I am the master of overkill. Seriously
version 1.0.1001.0a -dev
login - username
MOSYNC-2565. Deleted some NewGlobalRef which didn't make any sense, and added one which solved the problem
Merge remote-tracking branch 'upstream/ThreeTwo' into ThreeTwo
Merge pull request #265 from andersmalm/ThreeTwo

Three two
shutter update
shutter merge, weg update
overlap ausgabe extra für jones
Merge remote-tracking branch 'remotes/origin/master'
merging what's been done already
Fields Data Model and List
Request
Theme Service
Committing everything... facebook stuff and stuff
Trigger system events for each screen

Closes #9395

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
Add rsOtherTuning and rsOtherRecording recording statuses.

rsOtherShowing is a display only recording status used by mythfrontend
to indicate a program will record or is recording on another related
channel.  There are two long-standing problems with it.  One, it
doesn't distinguish between will record and is recording.  Two, it is
treated as a non-recording type.  Both problems force the user to find
the "other" channel in the EPG or elsewhere in order to see the
complete status and/or maniuplate the recording.  This change
addresses both problems.

Add new rsOtherTuning and rsOtherRecording recording statuses.  These
statuses are analogous to the existing rsTuning and rsRecording
statuses and indicates that a recording is active.  rsOtherShowing is
now analogous to rsWillRecord and indicates future activity.

Treat all of the rsOther* status like their analogs.  This makes it
possible for actions like stoping an active recording or adding an
override without having to navigate to the other channel.

This change also removes oneChanid parameter from the ProgramInfo
constructor and from LoadFromProgram since it is no longer needed.
Fix DB locking issue on MySQL 5.5

affecting DB initialization.  This is the DB init equivalent of
0bc768ee6 (and its backported version at 4ef6458b2f ).

Thanks to JYA for finding the issue.
(cherry picked from commit c419275d59de30b3f368013c1e5928f3a409e5cb)
correct bot_path 
correct translate function as non static


Signed-off-by: Narimm <benjicharlton@gmail.com>
ion_auth init
merge ion_auth and give up tank auth
Added access levels, color support, some command, help.. bla bla cant be asked to list everything

Signed-off-by: Norbo11 <norbo11@googlemail.com>
Make file _sidebar.txt
make Volkov a true Cyborg

- Added new Armor value: Cybernetic
- Use sounds/graphics from DE censored version
- Heals near repair pad (instead of hospital)
- Medic can't heal him
- Dogs can't eat him
- Tanks need to attempts to crush him
- +25% HP (now same factor as 4tnk:1tnk compared to e1)
add @Generalcamo to AUTHORS

original Volkov contribution came from
http://content.open-ra.org/index.php?p=detail&table=units&id=132
Merge pull request #2498 from Mailaender/volkov

make Volkov a true Cyborg
bug affichage
prefinalisation
Texture format and CLUT awareness for the cache

Fixes the intro screen in Tales of Eternia, but for some reason,
the Namco logo is purple instead of red.
Send signal return -EPIPE if the shared memory is closed
Test programs debug
Corretto errore documentazione; Aggiornata documentazione.
Aggiunta regola al makefile in modo che ad ogni operazione che richieda
l'eliminazione o la sovrascrittura di un eseguibile, questo venga
precedentemente terminato se in esecuzione
Aggiornate documentazione, istruzioni di installazione, pagine del
manuale
Terminata fase di testing.
Merge risolta
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.
Merge branch 'master' of ssh://git@github.com/PSR-hunt/hunt.git
Master branch now in English
Fixed REGISTER
Added rounded corners styling
Amended paragraph line height
added padding to the grid and amended index.html
comment: add key @pref for preference
fx13: get rid of legacy function

* now setStyleDisabled() does not enable the style
  see https://bugzilla.mozilla.org/show_bug.cgi?id=733339
QI-369 Upgraded JUnit from 4.8.1 to 4.10
Shiro Libraries: better assembly
Objects are no longer added while the title screen is showing.
Merge branch 'master' of https://github.com/RKrogh/FatBoy
Simplification!
Esc stänger nu spelet.
Fönstret stängs nu och inte ligger i bakgrunden.
Även detta fönster stängs.
sparar nu ner namn(nästan) och poäng till listan
Sparar inte längre till listan
Skriver ut listan och inte bara poäng.
Fungerar nu även på mac.
Merge github.com:jonsk197/FatBoy
Pängsystemsändringar
18:06

File Extensions in Cryptographer
NortelNetworks adapter implemented
Caesar implemented and tested a little bit in main
Fixed a bunch of YARD formatting errors.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
hand in tmr
new Event, general timer
Added support for double property type.
Add reader/writer roles

And a forum can have another default read access than banned/logged-out
and another write access than non-banned logged-in user.

TODO:
* ATM, a user can see forbidden things
  if he or she knows who or what to follow
* Clean User methods and Ability class:
  roles are ordored, perhaps I have to do
  something with this fact?
* Look sql queries in index
deleted empty project
gitignore better?
remove files not to be tracked
fix name
add crud store
edwin
lists
lists
cruds
cruds
uxs
Removed events caching - performance improvement
Deleted unused and old files
redirection after assessing a post
lien pour supprimer un mp à l'intérieur de ce mp. Suppression du bug d'affichage qui affichait certains mps en gras (bug situé dans l'affichage des membres participant à un mp)
POE: Modify scancel to send signals to slurmctld always, forward to srun
POE: Improve test suite for use with launch/poe
switch/nrt: prevent errors when restarting slurmctld with IP jobs
fix slurmctld memory leak
Minor improvements to accounting energy gather web page
Energy Accounting bug, prevent divide by zero for step with no allocated CPUs
Cray web page: Minor corrections
make correct dependency when building slurmstepd by itself
Update news to identify SLURM v2.5 and v2.6 contents
Update SLURM home pages based upon SC12 materials
Ocean depth PP rule and minor merge optimisation.
Merge pull request #272 from bjlittle/ocean_depth

Ocean depth PP rule and minor merge optimisation.
Added readme for GitHub to this branch too

Signed-off-by: Shahbaz Youssefi <ShabbyX@gmail.com>
Resources Int and Strings set up
Added fizbuz
COMP: External project CTK was using an incorrect git tag 

git-svn-id: http://svn.slicer.org/Slicer4/trunk@20119 3bd1e089-480b-0410-8dfb-8563597acbee
Extend point grab radius and remove cue from it's parent select
prepare for new layout
Finish rewrite of fc -l to take regexes as indexes

I would like for something like fc -l regex index or fc -l index regex
to work as intended, but I don't see any way that it can be bullet
proof.

Saying if first is a regex, second must be as well: means you can't make
the second an index.

Saying if second looks like an index, you can't use a purely numeric
pattern!

I will have to think on that a little.
Rewrote history_bin, added execute(), etc.

	- history command works again, yay!
	- execute() makes reading main_loop() faster.
	- execute() is and looks more DWIM than manually screwing with
	  stuff.
Update documentation on the history and fc commands
Refactor fc -l into listhist command.

Also made more legible with the introduction of igrep().
Extracted new select for years.
Some minor problems with achieved activities resolved.
Improved js.
xD bugfix
Server/Client have their own message type. Removed set_blocking from UdpSocket. Refactored some stuff.
Correctly returns OpenMP status in case of error
Do not make the first compilation attempt fail.

The problem is that node.op was still pointing to "self", not the
newly-created "op", so make_thunk still failed the first time.
Merge pull request #1140 from lamblin/fix_no_openmp

Fix tests when OpenMP is not available
Item list for tally list carry over is no longer hard-coded. The list
now contains all stockable items.
Ditched Chorewars plugin
Merge branch 'master' into sendmoney
新增了自製的Assert函式
Style: Use more fitting variable names in ai_car_standard.
change the default timeout for broken servers
Update lab3/lab3.pl

myTail to check if parameter one is the tail of parameter two.
LI
Create 20% branch for voltcli.
Merge branch 'master' of github.com:VoltDB/voltdb into test-voltcli
Merge remote-tracking branch 'upstream/master'
testing
Modularize voltcli and rename to volt.
Add --fix option to licensescheck.py
minor cleanup
VOLTCLI: have the general structure working plus a few commands.
voltcli checkpoint for backup purposes
New CLI working to replace all bin commands and voter run.sh script.
New CLI was missing vcli_config.py and had an unused file.
not-yet-functional function index support.
Not-yet-functioning function index support -- more successful alternative.
Merge branch 'master' into ENG-3204
Refactor to more consistently use vector<string> columnNames
Initial ENG-3204 function indexes
Distinguish the bold --fixall option from the legally neutral --fixws option that only fixes white space issues.
Merge pull request #187 from paulmartel/notest-licensescheck

Distinguish the bold --fixall option from the legally neutral --fixws op...
ENG-3204 without support or blocking of string expression indexes
Initial pass at a repair log class.
Tweak a comment and a log message.
Refactor - pull out declareAsLeader as standalone.
Add support for LEFT sql function
Add support for Right SQL function, check the test case for UTF-8
Add this test case, may merge it to other files later
I think I am done with Left and Right sql functions
Add extrem test cases and merge them to testFunctionsSuit
Remove debug messages.I am done with Right And Left functions and ready to send pull requests
Add function space, need test cases. I may work it out at home
Add support for SPACE sql function. But it has problem to be parsed by hsql
Add test case for SPACE
Add support for REPEAT and CONCAT functions
Add support for Concat and its operator. Add its corresponding test cases
Clean code and done what I should at VoltDB
Merge pull request #168 from jxchinaren/ENG-3283

Eng 3283
backend-parts are now in the modules (which needed to be redesigned a bit)
current nodejs breaks antiquated redis client
Vim: search is case-sensitive: use \c before pattern now
Updated to 1.6.2 (see version_history)
move_ip takesa an argument for both width AND height - added height argument
Added font manager, font base and bitmap font, also added a bitmap font example
Zen's first modify
smaller cushion logo
fixed win32 warnings in JSON file entry code
fixed directory browsing on windows
Extended the use of GameComponents (allows the use of specific containers)
README.md updated.
README.md deleted.
making joinable transaction a default behavior unless specified otherwise
haha3
Merge pull request #1 from aaronlin/feature
modify feature2
@= no more need perl
build agents from other branches
Merge branch 'master' of github.com:absperf/hubot
Add formatting to README as rst.
Directoryiteration in FileManager

Started adding xml-comments
fred1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/hub.unity
Add functions for VirtualBox
Force name at rendering step.
Agregar .jar al git ignore
Agregar gitignore
Compara con null
Bug 796255 - Alarm doesn’t ring on time if the app is killed and phone is allowed to suspend. r=vivien,timdream, a=blocking-basecamp
Add State.
New test suite.

Designed for better coverage and to be run with nose.
Allow for verticalCenter and horizontalCenter options to be false;
Removed rake dependency
Building projects with rake spec
update version 2.4.9-SNAPSHOT
DUBBO-627 使用 JavaBeanSerializationUtil 实现泛化调用或泛化实现
DUBBO-533 统一使用threads参数
去掉类上声明的无用import
Merge branch 'master' of https://github.com/alibaba/dubbo
Merge branch 'master' of https://github.com/allegro/ralph
Merge branch 'master' of https://github.com/allegro/ralph
Added missing HSHELL_ messages to lsapidefines.h
implemented ticket purchase and point decreasing
Adedd a .dir-locals.el for compilation from emacs
No reason to build inside Horde3d, can build in project root instead.
Fixed compilation errors
refactored methods in ui automation
changed collection select many references to have a direct property reference as opposed to using a method
Basic layout changes and CSS for S2 EntryPage in site style
S2 comment pages, with some CSS cleaning
more tweaking
more tweaking
Some styling clean-up
now with actual modifications
more style tweaking
fixing a mis-commit
More styling changes
S2 comment page styling on Celerity, Lynx and Gradation
Fixes comment interaction links on ReplyPage
proper interaction link styling
Merge branch 'develop' into nuketalkread

Merging development branch in.
Tweak to EntryPage css
Properly display collapsed comments and indent comment header information on comments without userpics slightly
Fixed minor display issues on EntryPage and ReplyPage
Fixed quick-reply container anchoring
More style-tweaks
(Bug 4149) Initial theme and layout patching, with preview images
(Bug 4149) Secondary pages styling
Созданы модели и контноллеры Posts и Complaint, для "свободного мнения" и "жалоб"
Implement console functions.
Allow #xxx in changelogs to be href's to changelogs
restoring CMAKE_REQUIRED_FLAGS after messing with it
change channel_info_st from static value to link
smiley faces added to happiest cities page
added more smileys, got jquery tabs working & added another happiest cities visualusation for Towns
just replaced lorem ipsum with actual text
Created my_model.rb to define the model (class currently MyModel and unchanged) and rspec
Edit gitIgnore

release folder added in ignore list
code nicify
lil' cleanup
added some files in ./tests which were used to test apis
code nicifzy
first package: implementation of twFSE
added node and npm to package.json
added end-point for retrieving articles by lat, lon
Merge branch 'master' of github.com:aodhol/nearme
Get rid of node_modules, add gitignore, use valid express version
Fixed broken `title` helper
Email messages show more state information in body.
Fixes bug with lock timeout.  High load still appears to cause deadlock
Updated tests, logging and cassandra version.  Still have dual locking
with multiple waits
Removed outdated code::blocks project for windows
Updated readme
add other baseElement example and tests
fix specified baseElement error #8
Assignment (Balloon): sleeptime in variable
song loading states
smart song images storing
browser integration fix
naming fix
Merge branch 'master' into chrome_popup
New example: syntax validator.

http://code.google.com/p/esprima/issues/detail?id=314
Split the unit tests fixture and runner.

http://code.google.com/p/esprima/issues/detail?id=307
Merge branch 'master' into harmony
added controllers and parserkind
Fix broken link in Active Record Query Interface guide
bug in example '<%= form_for ...' should be '<% form_for ...'
remove previous commit
embed code example using backticks in caching guide
fixed a minor spelling error
Merge branch 'master' of github.com:lifo/docrails
`assert_template` fails with empty string when a template has been rendered

For instance, it prevents false positive in this case:

    file = nil
    get :index
    assert_template("#{file}")
`assert_template` fails with empty string.
Move initialize_copy method around to let new method / build alias closer
Simplify constraints condition in scope when checking for Hash
Normalize scope recovering :blocks option name

Use the same :blocks key in the recover hash to revert the scope options
later.
Simplify scope options recovery by using merge!

Instead of iterating again over the options and setting one by one, we
can just merge the recover hash back to the scope one since all keys
match.
Use merge! in some places to avoid creating extra hashes
Refector a bit to remove extra slice iteration and splat call

This yields a small bit of performance improvement when building the
defaults from constraints, specially considering that it's rather common
for constraints to be empty.

Also, there's a bit of duplicated code in here that I have to check
before extracting.
Fix changelog entry about fast_string_to_time fix

Introduced in 53ca22f2e11cd3050d75385bc31b6bb5055a2738.
Thanks @rochefort. [ci skip]
document :hidden_field_id option for fields_for
Merge pull request #8306 from senny/documentation_for_hidden_field_id

Document :hidden_field_id option for fields_for [ci skip]
Don't call will_change! for datetime nil->"".

Setting a nil datetime attribute to a blank string should not cause the
attribute to be dirty.

Fix #8310
Merge pull request #8311 from alisdair/dirty-nullable-datetime

Don't call will_change! for datetime nil->"".
Merge pull request #8302 from roberto/assert_template_empty_string

assert_template("") will now fail no matter whether a template has been rendered or not.
Luminair, Area space etc
uploaded test text document
roll back for the bug
- Updated to use Melli's latest graphics.
- Renamed dexderity to dexterity.
a better way to emit 'end'
homework2 finished.
Including manual (documentation) build into tooling.
test branch commit
test branch commit
Added a view option to enable or disable angle arrow
Added tp.VonTraceShuffle, which computes Von Mises tuning of traces with shuffle test.
DS-1191 provide a warning in the logs if resumeLogin fails because of ip mismatch
DS-1192 new property to skip XMLUI ip checks during login
[DS-1039] Item view in Mirage theme broken when ORIGINAL or CONTENT bundle present and empty
make the dspace-info.pl caveman work in a new era
[DS-1136] Breadcrumb trail incorrect for community/collection browse and statistics
[DS-1136] Breadcrumb trail incorrect for community/collection browse and statistics (missing @params on methods)
DS-1200 add styling to statistics tables
Merge branch 'DS-1209'
DS-1208 adds build time filtering from a build.properties file in the base directory. Developers can maintain their own versions of this file, and keep it out of SCM, and then share the same source tree.
Different environments can also use theis approach, using the same source tree, just with different build.properties files, eg dev/test/uat/prod
DS-1209 all adjust files for the build time filtering
Merge branch 'master' of https://github.com/steveswinsburg/DSpace
Merge remote-tracking branch 'upstream/master'
DS-1211 upgrade to Servlet API 2.4, and other compatible dependencies
Add Google Analytics tracking code dependant on config
Add Google Analytics tracking property for jspui to dspace.cfg
Merge pull request #44 from robintaylor/DS-1190

[DS-1190] Google Analytics tracking support for JSPUI
Merge pull request #26 from helix84/archaelogy-and-restoration

make the dspace-info.pl caveman work in a new era
Merge pull request #40 from steveswinsburg/DS-1208

DS-1208 Build time filtering to allow multi developer/environment builds
[DS-1208] - rename build.properties.sample as build.properties to avoid a Maven build failure
Merge pull request #57 from robintaylor/DS-1208

[DS-1208] - rename build.properties.sample as build.properties
changed test api to use new config format
Merge branch 'master' into 1.2-dev
updated test code to use CF8 friendly syntax
changed to the new variales.framework config syntax
Code changes for #92 - makes url extension take precedence over accept header(s)
WIP updating examples for #90
Merge branch '1.2-dev' into ER90
added support for bean factory via variables.framework & updated more examples
allow passing empty string to variables.framework.beanFactory (does nothing)
updating all included examples to use new syntax
Merge branch 'ER90' into develop

Conflicts:
	core/api.cfc
	tests/tests/TestCore.cfc
update index.md for job options
drop auto bin update
add mac limit bandwidth
Adding loader (WIP)
updated sphinx documentation and readme. Included now also png files that are necessary to build the documentation.
added info that algopy is available as a NetBSD package
vim: add plugins - syntastic and vim-markdown

finally syntastic!!!
Added stop for the fake get_put_monitor.

This allows the get_put_monitor:stop/0 to stop the fake one.
Use regular logging on Travis for now so we can actually read the output.
Echo log files to the console when the suite fails.
Merge pull request #382 from basho/sdc-silence-travis

Use regular logging on Travis for now so we can actually read the output
VseLists.eomodeld version fixed
GroupReport regime added,
PedsivetDecision report
added Completion GroupReport
Don't generate documentation for textinput


git-svn-id: https://root.cern.ch/svn/root/trunk@43742 27541ba8-7e3a-0410-8455-c3a389f83636
- manual merge roofitcore + roofit with last version


git-svn-id: https://root.cern.ch/svn/root/branches/dev@47588 27541ba8-7e3a-0410-8455-c3a389f83636
-- merging all the rest as well (too many changes)


git-svn-id: https://root.cern.ch/svn/root/branches/dev@47589 27541ba8-7e3a-0410-8455-c3a389f83636
added Mercurial support
Committing current progress made into making sure the scripts work with CS5.5
Added check to make sure AE creates frames, if not mark the task as failed.
Conclusion et quelques fautes d'ortho
Fix: "Cannot read property 'target' of undefined"

see #commitcomment-2158996
- added require wrapper with no-cache feature (closes #45)
- require wrapper fixed to use caller's context (closes #45)
- added more non cached require usage (closes #45)
Merge pull request #57 from bem/require-nocache

added require wrapper with no-cache feature (closes #45)
- added support of the inheritance chains in Make.decl()
Broken link at bem.info for techs (bem/bem-www#36)
include path to new core.js in CRM.
cleaning app
Single TCP Not work
added TSD writing to series and datalists
Added necessary files to build xbmc in my way.

Added branch name to the make-devel log file.
Run xbmc at a higher priority

With this change the entire application is 'niced' up two levels.

You need to modify the file /etc/security/limits.conf by adding a line at the end:

    xbmc             -       nice            -15
Change installation path, session name and xbmc user directory name.

This patch changes the installation path (hardcoded) to /opt/xbmc-fm-master
adds a new session named XBMC FernetMenta Output to start the application,
in order to coexist with the packaged ad supposed stable version.

It changes the xbmc user working directory from .xbmc to .xbmc-fm-master
(Linux only), so to have a different configuration for the development
FernetMenta repository (branch master), with my patches.

Conflicts:

	xbmc/Application.cpp

Conflicts:

	xbmc/Application.cpp
Add display of current maximum bitrate in the 'CodecInfo' overlay window.

Fixed the max bit rate value reset at the end of play.
Enlarged the size of the Confluence skin codec information window to accomodate the new information.
Added a log at the end of play printing some information about codec dropped frames behavior.

Conflicts:

	xbmc/cores/dvdplayer/DVDPlayerVideo.cpp

Conflicts:

	xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
Change the computing of the chapter time position from muxer playtime to the video playtime.

This change takes into account the delay from the muxer time and the time the player is actually on.
Added indication of the version we are running in System > System info.
Added new packages needed to build.
Updated emacs desktop file.
Change installation path, session name and xbmc user directory name.

This patch changes the installation path (hardcoded) to /opt/xbmc-fm-master
adds a new session named XBMC FernetMenta Output to start the application,
in order to coexist with the packaged ad supposed stable version.

It changes the xbmc user working directory from .xbmc to .xbmc-fm-master
(Linux only), so to have a different configuration for the development
FernetMenta repository (branch master), with my patches.

Conflicts:

	xbmc/Application.cpp
Run xbmc at a higher priority

With this change the entire application is 'niced' up two levels.

You need to modify the file /etc/security/limits.conf by adding a line at the end:

    xbmc             -       nice            -15
Add display of current maximum bitrate in the 'CodecInfo' overlay window.

Fixed the max bit rate value reset at the end of play.
Enlarged the size of the Confluence skin codec information window to accomodate the new information.
Added a log at the end of play printing some information about codec dropped frames behavior.

Conflicts:

	xbmc/cores/dvdplayer/DVDPlayerVideo.cpp

Conflicts:

	xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
Change the computing of the chapter time position from muxer playtime to the video playtime.

This change takes into account the delay from the muxer time and the time the player is actually on.
Използваем вид на класа-парсер на формата vCard
code and output cleanup
Added experimental method: JValueW.mandatorySeq
Icke fungerande kod. Försöker hålla en session uppe
ignore docs/bizo
kill docs/bizo, just use jekyll_docs now
xmonad: reorganize manageHooks
vim: reset xmonad makeprg
xmonad: initial customized statusbar
xmonad: add red bracket for focused screen
Add make dist
Make x-browser compatible
Changed criterea for pose being behind
Cleaning up
Import internal commit ad11f5e7116a3834fee7839eb3fb62fd37775be3 : [APPROVAL] pending/master/remove-my_class5-tests-from-typetraits-test-drivers_drqs-35644799 to master
Import internal commit 849c21ede5e4f898db51adc9147c73ce2020f993 : [APPROVAL] bump-versions-to-2.16.0 to master
Merge branch 'import'
problem with const char * in the parser fixed...
added search form
Merge branch 'master' of https://github.com/bmeans/Banner
Typo.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12376 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Revert bad typo fix.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12377 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Phong shading had didn't check for negative diffuse shading
Make auto-complete work with the new coffee-mode tab binding.
push to prod
push to prod
Removed tomcatDependencies
Added the users module
Changed the UID of user
added sudoers module
Merge branch 'master' of ga:/git/pupm
Remove unused imports.
Import exceptions before using it.
Merge pull request #3 from abhinav-upadhyay/develop

Fix an import error and remove some unused imports.
update schema creation script to match what is currently in repmgr.c
fixes bugs in ImageIntegral. When image is large, static memery allocation would fail.
Remove expensive, unnecessary lock from db.GetObj
Merge branch 'master' of github.com:brendonh/loge
ignore temporary .lbr files
i2c master shield for arduino
Separated list and LINQ code, added headers
[Validation/Constraints] All now don't add an extra unnecessary constraint violation message.
[Validation/Constraints] New constraint: Collection
Server Interface
Removed the code used to implement an osc server, so that this library
can only be used for sending osc messages.
Removed Server and Zero-Conf
Removed server and zero-conf code so this library is only used for
sending osc messages.
Removed JMDNS
JMDNS is only necessary for zero-conf functions, which have been removed
Ignoring target folder
Binds rename operation
add some comments, minor tidy up
Add forgotten scala file
Don't rebuild ivysettings if one already exists
Don't create maker project output dir as it is used to test whrther or not to compile
merge changes from starling
Starting to make a portfolio website, these are the first files
use old multijson methods