labofsahil/github-event-dataset-2012 huggingface dataset:
also enable new style for relation-list
require fins version of django-json-field
Merge branch 'master' of github.com:mihi-tr/grayes
Use jQuery to bind/unbind DOM events if loaded.
Evaluate function values before running through formatters (unless they're for an event binding). [Closes #59]
Merge branch 'formatters-with-function-bindings'
sgaimporter modificado2
fix suite name to Dyntype
fix test suite compilation
修改应用池数量限制为6
Major re-architecting of the level declaration and curriculum definition system. There's now a curriculum.txt file that lists the names of levels in the order they should be played, and a set of level files, each declaring a level. Still need to convert levels in level.js to the new level declaration format and test to see what we can't yet express with it.
No message
No message
Revert "Added PATCH to allowed methods in NotificationResource and some JS code that sends PATCH request to api."

This reverts commit d7630a734158782ff7d4e705387e2708fc932290.
added model tests.
minor updates / clean up.
Merge branch 'qunit'
plan phase camera controls

need to enforce border restrictions
refresh of mockenstein
update init.lua to use renamed textures
Updated README and egg-info
Fixing precision issue

SENML numerical data are now declared as double instead of Float.
Raw DB Service fixed

Precision issue fixed, search service available.
Removing lava flow in the Raw Database service
Push now implements an update semantics

Instead of pushing duplicates, it updates a pre-existing value.
[#2540] Make Unit test runner work in Safari

[#2540] Drop test support through apache - Node testing only
removed all old elements; file input & dl work
fixing Chrome quirks
properly skip solitudeapi tests
disable physics when removed form world
asexual reproduction
Fixed a sorting bug
update store output for new plugin interface
Hoopoe loaded

The data loader's initial code is loaded and pushed.
United PixelWorkers
Initial drafts for listing connectors and easy attaching via socket
remove misuse of ftdetect for python
python folding.
remove unused rainbow parens
some settings from http://items.sjbach.com/319/configuring-vim-right
some ctags config
Implemented Anomaly detection algorithm for exercise 8
Improve layout

close #7
close #8
fix #3 References HTTP resources in HTTPS context
refs #3 References HTTP resources in HTTPS context
fix #3 References HTTP resources in HTTPS context
Merge branch 'master' of github.com:suin/legacy
support core update
Merge branch 'master' into core_updateable
Merge branch 'master' into core_updateable
Merge branch 'master' into core_updateable
support no-file uploading (directory only)
Merge branch 'master' into core_updateable
add set_time_limit(120) before put() each file
make logincheck.ini.php file each site
do check other process is updating
set ignore_user_abort(true) (Ignore user aborts and allow the script)
Add a link to the module management screen on the "module installation success" screen. (translated by google)
[ja]モジュールインストール完了画面にモジュール管理画面へのリンクを追加[/ja]
edit style of link to admin-panel
message translation
Merge pull request #22 from XoopsX/core_updateable

Core updateable
Merge branch 'xupdate' into CorePack
support server environment variable "http_proxy"
Prepared versions for release
[maven-release-plugin] prepare release 1.7.M01
[maven-release-plugin] prepare for next development iteration
Back to development version .
Merge pull request #16 from nawroth/master

Adding real manpages for use in linux installers, tweaking output looks.
Welcome @luanne !
Split clobber from clean to avoid frequently git clone
Modification du schema + creation des modules Admin et Front
Moar Variables.
revert not but fix'd
add createContext function for dependency injection in jasmine tests.
I18n can't be set from app.js.coffee, should be set in globals.
clean up define dependency arrays.
need to set window.cfg variable in global scope for createContext calls.
move config module so it is used in specs in place of HTML inline module definition.
update backbone forms to version for use with require.js.
put sinon in global namespace for now.
update app spec to use require.js dependencies.
fix up stderr killing off remote slaves
split startup of slaves into two parts to speed it up
Refactoring and documentation

squash! Refactoring and documentation
Fixed labels in address records
Removed config file from repo (use local file instead)
Added config file template
add dropdown to top nav for linking to user profile and ctnr page, logic to check if user is superuser in template
CPSS MERGE - added pdf draft mode and relative links when editing proposal.
browsers don't need this for fullscreen
gradients are back!
add aliases for pushing puppet and make sure we are in vi mode
Remap some window navigation keys in awesome and cut down on the number of key combos
better fluid handling
Fixed tasks not displaying their description
There were two dependencies on helios-spring-launcher - one for type jar and other for pom - removed the entry that was expecting jar as there isn't one for spring-launcher
Merge branch 'gh-pages' of https://github.com/nickman/helios into gh-pages
Final Without mailing
implement parsing text on sentences and sentences on words
Site updated at 2012-06-12 02:15:33 UTC
integración de doc oficial y la doc traducida en el mismo site
Ignore autocopied m4 scripts.
Implementation of serialize and unserialize.

To provide an easy to use interface, the basic functions
serialize and deserialize is introduced.

Deserialize is an exact copy of Json::Builder::parse, therefore
the parse function was removed.

Serialize takes "any" object and returns its json representation.
This is not an exact copy of Json::Builder::create (where Json::Value
was returned). create is kept intact.
Allow JSON formatting when serializing.

When serializing a structure allow the user to specify
how the string should be formatted. Default is MINIFIED,
change tests to accomodate this.
Documentation

Added and improved documentation after the usage interface was
implemented.
Merge branch 'fix/17/json_interface' into staging

* fix/17/json_interface:
  Documentation
  Allow JSON formatting when serializing.
  Implementation of serialize and unserialize.
  Ignore autocopied m4 scripts.
add comment in master
use lowercase pwd since only Mac OS X allows uppercase commands
Fix #473
Check for value error caused by no valid files found with files_changed
This causes an infinite loop when in auto-reload
Fix #467
Fix #451
Fix #443
Implemented better "valid files not found" behavior.
Used an exception so show error state.
Used a bool flag to make sure the error is only shown once PER error.
Updated tests to check for the correct Exception raised
Missed a line in commit.
docs: Pelican outputs to output/ not content/. Markdown ::: syntax must be indented
Merge pull request #478 from davidmarble/fix-docs-start

docs: Pelican outputs to output/ not content/. Markdown ::: syntax must be indented
Cleaned up tests.
Used assertItemsEqual in article generation to create more precise tests than with an elif chain
Separated out categories out into their own named test for clarity
Closes #405
fix issue #480
add some doc for webassets:
- usage of the sass compiler as discussed in PR #441
- debug mode and compilers (#481)
Merge pull request #474 from tbunnyman/fix#473

use lowercase pwd since only Mac OS X allows uppercase commands
Merge pull request #479 from tbunnyman/issue#405

Cleaned up tests.
Improve devserver durability. Refs #473.

Three changes:

1. Fix inconsistent "pwd" behavior by using make's $(CURDIR) builtin.
2. Change bash shebang to the more-portable form.
3. Tell users when Pelican and SimpleHTTPServer have been backgrounded.
avoid repeatition in the functional tests
Merge pull request #476 from tbunnyman/fixAutorunInfLoop

Fix autorun inf loop
Merge pull request #487 from getpelican/DRY-functional-tests

avoid repetition in the functional tests
Deep copy _DEFAULT_SETTINGS instead of linking.
This caused the defaults to be overwritten and edge case bugs with tests.
The test for empty setting needed to be updated to reflect that the method
for setting up the local settings sets extra settings.
Merge pull request #484 from saimn/webassets_doc

Webassets documentation
Added extra tests to help prevent regression.
Merge pull request #490 from tbunnyman/fixDEFAULT_CONFIGoverwrite

Deep copy _DEFAULT_SETTINGS instead of linking.
Merge remote-tracking branch 'upstream/master'
Don't assume even length of names section

This fixes #10.
Use ncurses' behaviour for trying terminfo dirs
Merge branch 'ncurses-reading-behaviour' of git://github.com/guelfey/termbox-go
Update .osx

Update for my preferences.
Signed-off-by: Shannon Fenn <shannon@shannon-mint.(none)>
Merge branch 'master' of git@github.com:nubots/robocup.git

Conflicts:
	Vision/Vision.pro

Signed-off-by: Shannon Fenn <shannon@shannon-mint.(none)>
Merge branch 'master' of git@github.com:nubots/robocup.git
1. Database Schema + Model, 2. ACL, 3. Flexitable data population and polling
paging order history
before changing of local variable handling
remove uneccessary urldecode
cleanup: removed old network from init
don't use c style casts, fix style
add tp_compare
add is_true for pobject to be able to set bools properly
replace Py_RETURN_NONE with something more 'native'
added pgl configuration
Issue #51: add report modal
Disable pivotal scripts temporarily since it crashes on load.
pvr: moved some of the persistance logical from CPVRChannel to CPVRDatabase
pvr: optimisation for the initial channel import on sqlite3
epg: speed up the initial epg creation
Add a test case for generation of libvirt guest config

Replace the test case for checking XML template info which was
deleted earlier, with a new test case checking the XML config
objects.

blueprint libvirt-xml-config-apis
Change-Id: I1ddd945111dcde0e67aba280bf0d11a8dab6c44a
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Update notes for submitted changes

* Fix ip6tables support in xenapi bug 934603
Update notes for submitted changes

* Delete the test_preparing_xml_info libvirt test
Rewritten import paths from mattbaird to opesun.
Add in abiity to specify user with env vars
Prevent webui user having same name as other bootstrap accounts
fix path for git completions
Allow us to remotely view the template source. Closes #15
Added condition wildignorecase if exists.
Elaborate on insttalling Ruby on windows
export is keyword
Remove dead links
textures for lights, somehow they didn't add
fixing merge conflicts
Added basic error reporting.
added a recieve message sub test for Google+
Adding ability to update to the latest build templates on Jenkins
More freedom for shadow settings.
local.txt deleted
Added "donations" option to main.html
Move "Remove layer" menu item to timeline menu
Add enablePath to RubyPipe
Update #as spec.
These no-op pipes should not add themselves to the path.
All Green!!!

(at least for TinkerGraph and Neo4j)

If you specify a wrapper and extensions, try to create a new wrapper with the combination.
Починены переменные
Fixes for 1.8.7 compatibility

Signed-off-by: Patrick Hogan <pbhogan@gmail.com>
增加一個關於 DateTime class的版本要求說明到讀我檔之中
Merge pull request #4 from j03060928/develop

增加一個關於 DateTime class的版本要求說明到讀我檔之中
Fixed render-canvas branch for Linux
init commit
Test
Fixed failing travis tests.
Added new tools.
fixes and tweaks to environment and apps; added mechanism for traffic management (environment request() override)
修改导入团队信息功能
Merge branch 'master' of https://github.com/phiree/testttt
add reference to mvcproject
try adding screenshots
remote blinking
Update notes for submitted changes

* test7 add
Results writer, Haversine distance
- updated to 1.3.1
- updated ufconfig,shared patches
- rebuild for kernel-3.5.4-1
- release 53 (by relup.sh)
Pass in ConversionImageHandler
because I'm not paying these commits
Remove now unneeded code.
Also reduce garbage tags on deletion.
Fixup garbage reduction tests.
Fixup another test.
Updated AUTHORS.
Minor edits to tutorial (capitalize ddfs, delete trailing whitespace).
Update release notes.
Add erlang-inets to debian dependencies.
Avoid using git:// urls to avoid firewall issues when building.
Bump version number.
Update release date.
Add a dummy version file for rebar.
Merge branch 'master' into devel/scheduler
require jruby-openssl on JRuby
extend JFrame and implement KeyListener.

It's using GUI library, Swing.
Proper scoping of classes under Planet
Updating dependencies
Version bump
Version bump
More test coverage
Improved diagnostics and simplified some stuff.
Minor tweaks + removed spark.config file from demo project.
Tests for SharingRegistrationDiagnostics
fix for debuggerdisplay
Tests for RecordingSharingRegistration
Added tests for sharing policy activator
Comment to SharingPolicyActivator
Increased test coverage.
Renamed SparkEngineTester to DefaultServicesTester + DRY
Merge branch 'async-followup' of https://github.com/CoreyKaylor/fubumvc into CoreyKaylor-async-followup
Merge branch 'tag_builder_fix' of https://github.com/rauhryan/fubumvc into rauhryan-tag_builder_fix
Made SharingConfigActivator look for config files in packages before in the app
Temporarily excluded some Async Behavior tests due to incomplete impl in Mono.
adding url encoding to form post data in the OWIN support
turning nuget publishing on
Improved async error handling

The error handling for async requests work now with samples
Introduced IExceptionHandler to make handling errors
for async requests less difficult
Minor fix for CombineAllUniqueSetsCombinationDeterminationService that ensures mimetype on plan matches with the one on policy
Added hack for Redirect performing an Http 200 redirect
Passing Redirect via Headers
some work
Merge branch 'master' of github.com:protective/GSC

Conflicts:
	Article/src/Introduction.tex
	Article/src/TestResults.tex
* BugFix: incremente was missing
 * moved TOM classes from groups package to protocols/pmcast package
Default width now 1.0
New Graph ! \o/ Disk usage as a Proof of Concept (hahah)
[enh] added index on acivities.docs
[enh] caching meps for asmep filter
Modification CMDB API resources
PEP8
Typo
Documentation for resource CI filtering in API CMDB
CMDB API tests
Continuation tests CMDB API
Relations between CI's in puppet plugin tests added
Merge & adding test
Merge pull request #232 from quamilek/dev2

Show external_key in cmdb view and fix sync problems and incidents from jira
Merge pull request #218 from quamilek/api

CMDB API resources
ATest commit
Merge pull request #9 from queeg500/ATest

Please review and pull my branch
Adding hooks for plugins. #gklst
Javascript plugin generates components now. #gklst
Start
Start
bugs 0000158, 0000164
marge with ciext
fix menu
Merge branch 'master' of https://github.com/r-team/control.git
Enhace r2wui and implement 'pdj' command (disasm to json)
Start on Aleph branch; WIP
[#41592811]fixed dropdown list relative position
Merge branch 'development' of github.com:railsware/piro into development
missing self
Merge branch 'master' into install_theme
Resetting doors at the start of level update
korjattu NHL-statsia
Added good error message for access denied on starting HttpListener.
Removed wrong version of JSON.NET from HttpGateway project.
Documenting the release process...
partially done checkout
initial commit.
Merge branch 'refs/heads/original'
Adding content to readme, so i can test pull-req webhook.
Merge pull request #7 from galstrom21/master

Testing post-receive hook
everyone should be able to log themselves out
better defaults for Auth
Adding psix to build directory
Miscellaneous maintainence
Modified bootstrap settings for phpunit test runs
Autofill for lists off
Must remove right key as well.
Only remove when it exists.
Do not override enclosers when starting enclose-mode.
a_branch 2nd entry committed.
Merge branch 'A_branch' into B_branch
icinga: bump to 1.8.3
crossroads-2.79-1: new upstream release
Edited README (6th version)
Edited README (7th version, amended)
Update README.md

Expanded example of answering word incorrectly
moved client lib dir to scripts/lib, created css folder
moved bootstrap css files  to css/bootstrap
catered for non-continuous numbers
VarEscaper, VarResolver
Added file in support of EOPS-25
tidy up pad connection into a single connect function
updated all the node/pad reference system to be a bit saner
Update TBParsing.h
Remove indentation from bbp_get_user_favorites_topic_ids().

git-svn-id: http://bbpress.svn.wordpress.org/branches/plugin@3900 9866e705-20ec-0310-96e7-cbb4277adcfb
modified mgen
*Enhanced listenArtist
adding POS tagger model file and adapting code
disabling match expansion for dictionary
adding mention expander component
integrating POS tagger and mention expander components into ChemSpot
adapting annotation merger to merge adjacent annotations
Extra date_function added.
add doc, simple concepts for testing
Merge branch 'master' of https://github.com/roeiba/WikiRep
Revert intro text
refactoring drawable card
Minor JSLint corrections
Fix typo made while fixing node-xmpp-bosh

Funny thing is that node-xmpp-bosh happily parses malformed packets.
Parse XMPP stream opening

Instead of using regexp, parse an XMPP stream opening (after some
preprocessing) to extract stream id.
T: Update README.md
media/video styling
Bump version to 0.7.1
Update release notes
Typo
Improved error reporting on missing type hints
Fix: test for index existing to avoid notice in strict mode
Name will be simple 'meta' after all.
Fix typo
Use Compiler class in resource namespace
Load page only when needed and cache
Use basic ruby accessor to data rather than mustache context
Rename paginator.rb to collection.rb
Fix paginator previewer
Hack out a compiler for posts pagination
Made parser slightly more stateful, removed 'end' keyword ...uses indentation
aint just test
Merge pull request #9 from rvgate/master

New interface definition and savechain concept
Update on git workflow file. Renamed file for issue (bug?) with git paths containing spaces.
Merge pull request #10 from Newanz/doc

Update on git workflow file.
first setup
herstructureren van applicatie
interface vergeten
nog iets vergeten, sorry
aanpassing, nu moet ik ophouden..
Merge pull request #11 from timmuller/master

Eerste merge voor overgaan nieuwe git infrastructuur
Created descriptive warning whenever the serviceprovider throws a stackoverflow error. Caused by calling the serviceprovider within a service constructor or field declaration
Merge branch 'master' of github.com:rvgate/HUSACCT
Created descriptive warning whenever the serviceprovider throws a stackoverflow error. Caused by calling the serviceprovider within a service constructor or field declaration
Merge pull request #12 from rvgate/serviceprovider

Serviceprovider fix
Commit Erik 24 April 2012
Merge branch 'master' of https://github.com/ErikBlanken/HuSacct-2012
Merge branch 'master' of https://github.com/HUSACCT/HUSACCT
stub modified because of tests
InnerClass Calling works perfectly, everything will be correctly generated: Package, Class, Import, Attribute
Aanpassing Services: isAnalysed
Alle Services Working
Add MySQL to list of returners.

Add MySQL to list of returners.
Improve formatting of docstring so it looks better
in the actual documentation.
Add python module requirement
Merge pull request #2675 from UtahDave/add_mysql_returner_docs

Add MySQL returner docs
Merge pull request #2678 from s0undt3ch/develop

Add `tests.saltunittest.RedirectStdStreams`.
Merge branch 'develop' of github.com:saltstack/salt into develop
modified:   s9g-configs.el
Merge remote-tracking branch 'origin/master'
fixed token length error.
basic markdown processing
fixed test and addHeader
Merge branch 'master' of https://github.com/saboorian/moor
codice originale afo
database
other backup
Fix test if there the host has multiple subnets.
Merge branch 'develop' of github.com:saltstack/salt into develop
Handle some quoting issues while building the whitespace regex for `file.append`. Fixes #2227.
Just some renames. Refs #2227.
Merge pull request #2231 from s0undt3ch/issues/2227

Fix #2227
Cast `__version_info__` elements to `int`'s.
Merge branch 'develop' of github.com:saltstack/salt into issues/2566
Deprecate `--*-out` in favour of `--out/--output`. Fixes #2566.

* Added the necessary code to support the new `--output` option.
* Added the code to warn users on salt < 0.10.7 and error on salt >= 0.10.7
* In order to get the outputters at runtime, I need to add a switch to `salt.config.minion_config()`, `check_dns` which default to `True` to keep behaviour and when `False` speeds up it's use.
Typo.
Fix chicken/egg module import issue.
Fix tests and "convert" text output to "txt" when choosing outputter.
Merge pull request #2576 from s0undt3ch/issues/2566

Deprecate `--xxx-out` in favour of `--out/--output`
Add test to file.{comment,uncomment,sed,append}
Add test to file.touch
Start refactoring file.managed state
git state should report "changed" on first clone

Was trying to write a state that recompiled when the repo changed,
without something like this it wouldn't compile the first time it was
cloned
Adding git.submodule (and associated state option)

This should make git more useful for larger projects
Merge pull request #1588 from blast-hardcheese/develop

git state should report "changed" on first clone, also adding git.submodule
In the process of implementing Route.
changes to StringReduction
bug fix in first introductory message
upgrade bootstrap, small stuff
reorganize html includes
small changes
git fix
--30%--
bbctl: add proper hexdump for FEC data test

Signed-off-by: Jeppe Ledet-Pedersen <jlp@satlab.org>
Revert "orginal files"

This reverts commit d07a3ee554ce9100cb413e2fc6f3f1c811dea8e5.
Excepciones marianistas

Change-Id: I7ad1a2e751fbda6fc97b2dd0a0646839b2da78be
Modificaciones y ajustes

Change-Id: I6954e9f4970a0c2b68bfb3680da3f57dc8409c03
Enable unit tests for PostgreSQL searching.

These tests will fail for the moment due to bugs 37702 and 40821, but
that is expected.

Change-Id: Ie179e51e3a17930efb1ccc72ac38ceffe88f0877
Treemap desactivated
try to add openfile dialog box... doesn't work yet
wapaje : adaptation from pajeng errors correction
recursive
test matches
style
recursive bug
Merge branch 'master' into gh-pages
More FSF address changes.
remove unneeded challenges controller actions/views
remove the challenge/*display partials and inline the code

since the partials were only used in one place (or twice in one case)
each and were trivial, inline them to keep things simpler
simplify the challenge display css and html
add some clearfix css and remove div.clear from the html
require login for all relevant controllers, remove devise routes

since all registration/login is done through the home controller, we can
get rid of the devise routes

i cant get the devise authenticate_user! helper not to use the devise
forms, so just use a custom helper - since its trivial anyway
adding game related css
first feed attempt
added dragon log parsing
Vergleichs-Ringpuffer hinzugefügt
cardset fixxed
card set fissed
Prepare for version 3.4.1 [ci skip]
value2 fix in insertSQL
value2 fix in insertSQL
add span
merge
some more tweaks to base... responsive navigation
issue #18575: moved add_priv to database
Changing db location
Rename smswall.py and add universal list script
Add clean-confirm script
recoding the entire library

things will be broken for some time, but the old code is still present
as a comment. the library will not work since i am recoding the entire
thing.
rm ark_vim
Fixed off-by-one bug in get_layers_res
Fixed typo in planner
Fixed typos
Fixed logic bug in get_use_roi
Separated update connectivity graph to lines and layers

Also exposed a silly performance issue.
TODO: implement the method stub.
Made sure we'll call update_connectivity_graph_layer

Later when it is implemented
Added an assertion related to time-management
No longer alpha...?
Generated files - should be final. Anything else we need to add?
search() is working
globalne funkcje fuj
implemented double-click selects a whole shape
test server
reconnect
fixes for google native client.
various small API changes

 - add tryWait, tryWaitSTM
 - rename waitSTMThrow to waitThrowSTM
 - return a more useful result from the waitAny* family

waitAny :: [Async a] -> IO (Async a, Either SomeException a)

waitAnyThrow :: [Async a] -> IO (Async a, a)
Updated README, added zservertracelog entry to list of available collectd
plugins.
Added code for making game moves in the command class
Resize Funktion hinzugefügt V2
Fixed default debugging options.
Hard code the dash rotation.
Remove useless file path computation
20120923h
20120923i
20120923j
Merge pull request #7 from slhfyj93/master

gmp
20120923k
bzip2
Moved mist to extras
Added weights functionality to opDictionary, spottests passed
Bugfix for mtimes opMatrix optimization
Add CONTRIBUTING file.

If the CONTRIBUTING[.md] file exists, Github will show a link to it to
anyone who files an issue on Github or opens a pull request on
Github. We don't want people to do that, so this file points people at
the OpenStack wiki page with instructions on how to contribute
properly. This should cut down on the number of pull requests and
Github issues that we then have to spend our valuable time ignoring.

See also <https://github.com/blog/1184-contributing-guidelines>.
reordered strict fields
added .DS_Store
added human readable time field to Tracking table
son guncelleme..
WINTERMUTE: A first attempt at getting savegames to work.
Optimization to DotLiquid rendering to avoid rendering to a temporary string and then to the output stream - now renders directly to the output stream.
fixed build failure when no user settins.xml

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
vcs抛出异常修复
Create multToke.php

Gets request token and exchanges for Access Token. You must input your consumer key and secret at the top of the script.
Changed namespace from com.sppad to com.sppad.booky.
Build also ignores README.
Added history menu to context menu, currently only shows 1 week of
history.
Preferences cleanup.
Removed some dump statements.
Fixed issue with dragging tab and it being stuck in the last drag
position (part way there).
Added config option for history menu history length.
Commenting / cleanup.
Bug fix: launchers now are properly removed from overflow menu when last
bookmark is removed.
Removed unused script import, moved tab string bundle.
Cleaned up by moving to new folder
Update Slovak translation
Merge pull request #542 from Mikino89/master

Update Slovak translation
Merge pull request #540 from srazi/master

The bug about Windows blur effect and PDF plugins was fixed.
modified:   config
	modified:   server_system_test.cc
Merge branch 'master' of github.com:srcvirus/klink

Conflicts:
	config

	modified:   build_deploy.sh
	modified:   client_system_test.cc
	modified:   config
	new file:   imonitorlist
	modified:   plnode/ds/configuration.h
	modified:   plnode/logging/log.h
	modified:   plnode/message/control/peer_init_message.h
	modified:   plnode/peer/peer.h
	modified:   plnode/protocol/plexus/plexus_message_processor.h
	modified:   plnode/protocol/plexus/plexus_protocol.h
	modified:   server_system_test.cc
commenting out some trouble modules
moving to use explicit lifetimes
dispatching from connection to opened channels
some higher order API
Added code folding for different file types
Added edit page for Core server config. Added stub for Core default
messages edit page.
Some issues with tmux 1.6 caused me to add a CAVEATS section to the
README.
No we're getting somewhere. The script is working for basic stuff.

TODO: More testing of file transfer mode.
TODO: Test sudo commands.
quick fix for #119: insufficient trajectory length
Histo
Merge branch 'master' of github.com:sylvainw/10h00
Histo
spotted bug causing scroll defect is method data.html
narazie same todo porobione bo nie ma wysylania zapytania
*Введён русский язык
Updating bashrc
Fix conflict
two configurations added
added assignment 3 files; started type checking modifications

added function intExprCheck() for arithmetic operations in the Visitor
type check program
composer typos
sample data, without all the maths (averages and things). Assumes I've read the schema properly
Ajout d'un dispositif pour contrôler que le serveur est bien présent.
Worked on paging.c
EHO-226 - failed on Windows, depended on system's file separator.
EHO-226 - removed duplication, reused convenience methods on EhourHomeUtil
EHO-121 fixed column width
EHO-121 long project name is shown when there is space in the month overview
Resolves major bug in Promotion Engine.
subscription renewal fix
Bugfix in copy(); remove license from examples
Here are the drafts for the site so far.
Forgot ImageExtension.php
Added a canvas clear on show
Updated readme to be more representative of the tool
Fixed the way video objects were handled by the worker thread
distance rewrite
Fixed and cleaned the clients module
Added scoreboard example
Sync patch r13483 from main trunk.
Return EFI_BROWSER_ACTION_REQUEST_FORM_APPLY action request to avoid discard action useless.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@13795 6f19259b-4bc3-4df7-8a09-765794883524
Sync patch r13510 from main trunk.
MdeModulePkg/Ata: add dynamic type to PcdAtaSmartEnable.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@13796 6f19259b-4bc3-4df7-8a09-765794883524
Sync patches r13537, r13609 and r13736 from main trunk.
1. Added secure boot in CSM module entrypoint, if UEFI secure boot is enabled,
   CSM module cannot be started.
2. Check if active video mode is changed after OpROM starts, if active video 
   mode is not changed, skip INT10 calls to improve performance.
3. Handle the case when OpROM wants to completely remove itself.



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@13797 6f19259b-4bc3-4df7-8a09-765794883524
Added compact styling for templates & media-browser.
Added placeholder collection info view
Added placeholder map view
fix oauth redirect url (again)
Very slight tweaks for 2->3 compatibility
fixed bugs and shuffle answers
added list of questions under user show page
conflicts resolved
messages styled, users page no longer works
Small fix
Improve GoogleCalendar
Improve GoogleCalendar
Update Twitter Bootstrap to version 2.1
Fix: <input> cannot be inside <ul> without <li>
No database seeds
added new files mostly test files
make file for x86 systems
added info about syntax of  a batch file
make file for x64 systems
added license info
cleaned up code, added support for processing multiple files, consistent documentation and offcourse moved ucrypt to version 0.2
Linkify URLs
postfix statements
Implement ping
w3c validation
layout
cgroup: cgroup_attach_task() could return -errno after success

61d1d219c4 "cgroup: remove extra calls to find_existing_css_set" made
cgroup_task_migrate() return void.  An unfortunate side effect was
that cgroup_attach_task() was depending on that function's return
value to clear its @retval on the success path.  On cgroup mounts
without any subsystem with ->can_attach() callback,
cgroup_attach_task() ended up returning @retval without initializing
it on success.

For some reason, gcc failed to warn about it and it didn't cause
cgroup_attach_task() to return non-zero value in many cases, probably
due to difference in register allocation.  When the problem
materializes, systemd fails to populate /systemd cgroup mount and
fails to boot.

Fix it by initializing @retval to zero on declaration.

Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Jiri Kosina <jkosina@suse.cz>
LKML-Reference: <alpine.LNX.2.00.1203282354440.25526@pobox.suse.cz>
Reviewed-by: Mandeep Singh Baines <msb@chromium.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Merge branch 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

Pull urgent cgroup fix from Tejun Heo:
 "Commit 61d1d219c4c0 ('cgroup: remove extra calls to
  find_existing_css_set') which was part of the rc1 cgroup pull request
  made writes to the cgroup "tasks" file return an uninitialized retval
  on success which can cause boot failures with systemd.

  The change stayed in linux-next for quite some time but gcc
  interestingly failed to emit warning about using uninitialized
  variable and the problem seems to materialize only for certain build
  combinations (probably depends on register allocation).

  It's just missing local variable initialization and the fix is trivial
  & safe.  As the problem is critical when it materializes, I'm
  fast-tracking it.  Also included is Li's email address change in
  MAINTAINERS."

* 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: cgroup_attach_task() could return -errno after success
  cgroup: update MAINTAINERS entry
Fixed event-post issue for input; also fixed dumbass bug in PlaneDragger
New Theme: Most of the way there. Still need clean up the styles more.
narrow to environment "document", and more alias
using number traits ZERO/ONE + small correction in test file
Remove useless debug file
Move the file DataAccess to DataAccessLegacy
Merge branch 'master' of https://github.com/tucker777/QSTK
lotus.domino:notes:8.5.3 and com.ibm.domino:com.ibm.domino.napi:8.5.3.20110915-2025
added matcher to check that character is dead
modified poison test to check that character actually dies
refactored is_at to is_in and is_not_at to is_not_in
add giraffe to readme
xxxxxxxxxx
Merge branch '1.0.x' of https://github.com/txteam/tx-core.git into 1.0.x
xxxxxxxxxx
xxxxxxx
xxxxxxxxxxxxxxxx
Allow jruby-head.
final: found problems with radial kernel and b calculation. Answers now match AMPL
Add require_once()
Fixed isInjected state not being set
Loadout nearly finished
Update js/ca/page/guild_battle.js

Little correction for add Battle activity points filter (on hit victory) for guild battle
Merge pull request #119 from Bonbons/patch-2

Update js/ca/page/guild_battle.js
1.1.32 ADD: Conquest points added to summary
borramos la carpeta rails y subimos cambios sobre pacientes
changed the theme to iOS
basic modals for tools complete without save functionality
Made graphs prettier :-)
Improved graphs and added my cache hierarchy results (no descriptions yet)
Fixed the problem that couldn't start ModChecker.
Fixed a bug that fails in starting of BOSS in non-unicode mode.
update 'Wrye Bash Debug.bat'
Update queryable#find to use new method signature for search
Make ContentTypeParser deal with MIME type parameters that are shorter than 7 characters.
Added math.c/h files. Still in development.
Merge branch 'master' of https://github.com/veeableful/lib
Remove syscalls.cpp and add README
Merge branch 'master' of https://github.com/vikrem/IdleSow
More parsing... more tests
Pass inserted fields node to insertion callback
Modify nested stragegy
add directory naming
image uploading with jQuery File Upload
Sync taskwarrior todo list.
Add some more error translation
heroku wants json
checks at least if it isnt 200
weiter mit base template nach m-demo2
mustache funktioniert auch auf client side
weiter bei addInfoPage() hier ids aus spec

	modified:   ../_attachments/js/init2.js
	modified:   ../_attachments/vaclab/yamp.run.js
	modified:   ../shows/start.js
	modified:   base.html
	new file:   baseFallback.html
	deleted:    content.html
	deleted:    content_fallback.html
	new file:   infoPage.html
	deleted:    navigation.html
	deleted:    navigation.html~
	deleted:    navigation_fallback.html
	deleted:    t1.html
	deleted:    t2.html
bind mp_run
run bind geht
add: detail readme
Search filters work, results are not passed properly to calling function.
Animation ugliness fix
Using shortcut extension.
jQuery updated to 1.7.2.
Using inline license.
Removed who page.
Swapping the doc files to be more clearly.
Added forgotten features descriptions.
A summary of Facades by Philip Glass
prohibits Comm sending until it has a player number
move ore-core to development_dependencies
- Removed all the renderDelay code. Since the switch to async, this logic shouldn't be necessary anymore, and was causing some components to be rendered twice
* insert test.
* select test.
common.php modification
Allow folders with spaces in their names https://www.virtualmin.com/node/23013
Merge branch 'master' of github.com:weejulius/oops
Merge branch 'master' of github.com:weejulius/oops
Refactored some global variables.
去掉多于图片
Default min/max for filters are now set to the min/max of the parents.
Fixed some issues in the default pipelines.
Added a Mel-scale filter (to display the spectrum using a log scale).
removed minified bootstrap.css - will minify our custom css at deployment
Methods need to be applied directly to the module.
Added actual basic readme
Adjusted learning rate, discount factor and exploration rate to rock :)
JAVAC -target/-source setting.
Support for trace-based scenario generation.
Sanity checking for simulation starvation.
More flexible scenario generation.
Workaround improperly timed allocator notifications.
Paranoid consistency checking for simulation stuff.
Fix typo in Makefile.am
Avoid making duplciate task IDs in simulation.
Fix bugs in promptly reoffering, etc.
Fix some livelock issues; test for reoffer loops (that will need to go away eventually).
Fix NoRequestAllocator delay/reoffer logic better.
MasterAllocatorTest cleanup.
removed confirmation box from index
blog2 -> blog
force using unsigned types
fixed the green screen problem happened at switching from gstplayer(hw decode) to dvdplayer(sw decode)
I had to do this
supporting bam indexing and samtools view functionalities in API
ModSequence.{cpp,h} -> orderlist.{cpp,h}
minor cleanup: remove redundant namespace prefixes
added diploma text
Tok bort alert-greia
myclips.strategies.default -> myclips.strategies.factory
myclips.strategies usa un dict (myclips.strategies.STRATEGIES) per il
mapping delle strategie valide
Implementazione delle 7 strategie in icse-ie.
Importazione di BList richiesta da Mea, Lex, Semplicity e Complexity,
altrimenti fallback su Depth automaticamente (le classi verranno usate
come alias di Depth)
Modifiche ad Agenda per allineare al nuovo factory
myclips.strategies.isValid spostato come metodo statico di classe di
myclips.strategies.factory
myclips.strategies.STRATEGIES spostato come proprieta' statica di classe
di myclips.strategies.factory
Bugfix to ensure that the "class" attribute is properly saved when
inserting an image for the first time.
Prevent setting the "href" attribute for non-anchor elements. This
prevents proper W3C validation.
Merge pull request #282 from virgofx/master

[BUGFIX] Image Class Attribute & Non-Anchor Elements "href" Attribute
Avoid global var leakage
Merge branch 'master' into line_breaks
北齊書卷6譯
added support for pasting images from the clipboard in webkit based browsers
next version is 2.4.4

git-svn-id: http://piwigo.org/svn/branches/2.4@18273 68402e56-0260-453c-a942-63ccdbb3a9ee
new file:   _includes/themes/fb/default.html
	new file:   _includes/themes/fb/page.html
	new file:   _includes/themes/fb/post.html
	new file:   _includes/themes/fb/settings.yml
	modified:   _layouts/default.html
	modified:   _site/CNAME
	new file:   _site/README.md
	new file:   _site/Rakefile
	modified:   _site/archive.html
	new file:   _site/assets/themes/fb/bootstrap/css/bootstrap.min.css
	new file:   _site/assets/themes/fb/bootstrap/img/glyphicons-halflings-white.png
	new file:   _site/assets/themes/fb/bootstrap/img/glyphicons-halflings.png
	new file:   _site/assets/themes/fb/css/style.css
	modified:   _site/atom.xml
	modified:   _site/categories.html
	new file:   _site/favicon.ico
	modified:   _site/index.html
	renamed:    _site/lessons/2011/12/29/jekyll-introduction/index.html -> _site/lessons/2011/12/29/jekyll-introduction.html
	modified:   _site/pages.html
	modified:   _site/sitemap.txt
	modified:   _site/tags.html
	new file:   assets/themes/fb/bootstrap/css/bootstrap.min.css
	new file:   assets/themes/fb/bootstrap/img/glyphicons-halflings-white.png
	new file:   assets/themes/fb/bootstrap/img/glyphicons-halflings.png
	new file:   assets/themes/fb/css/style.css
	new file:   favicon.ico
Extended HEX File Parser.
Rename setup.data.sql -> sample.sql
optimization
add find2-find-project extension to find or custom project directory
Precede null path segments with dashes (#421)
ignore rubinius temp files
First commit about india.
Add india tag.
Makefile clean fix + lock in tn_link_start() + assert in _set_sync()
link: Added message handling framework + bugfix in setting NULL error
link: Implemented syncing of our patterns to the connected party

While this seems to work, I suspect that there is a possible deadlock in
the current code. I'll have to further investigate that and try to come
up with a fix...

Also changed the way tn_link_write() works, because it's more efficient
to write to the buffer directly instead of first constructing the
message in a temporary buffer and then potentially copying it to another
one.
support multiple subdirectories of python files
Update docs/getting_started.md

fixed some wording mistakes
allows script loading from cache
Map and Cell classes
IMap ICell
Added images and put the styling into a separate file
alterando a classe PersonagemPrincipal para trabalhar com um imagem
maior
Fixed minor UI issues and updated test case view.
gdb key modify
use seajs 1.3.0 and spm build ok
Add seven sorting algorithms.
fixed windows keyboard shortcuts (like ctrl-a)
refactored some global references (window)
minor change in the example source
set filename when saving to local drive in chrome 14+ and msie 10+
remove contents of optional arguments in frame environments
add paddings to frame and tableofcontents environments
Add traverse_ref and traverse_objects to git.CatPipe
Add a bup push command
Add documentation for bup push
Add testcase for bup push
qty issues fixed
detil
detaill
add met update_one_field()
Fix autoupdate for mysql
;
added trend to percentage instrument
Adds ability to scope tests usings 'within' method.

For example, these tests

  xml.should have_xpath('/some/element[1]/property1').with_text('value1')
  xml.should have_xpath('/some/element[1]/property2').with_text('value2')

can be rewritten like so

  within('/some/element[1]') do
    xml.should have_xpath('/property1').with_text('value1')
    xml.should have_xpath('/property2').with_text('value2')
  end
Merge pull request #3 from hollowspace/within

Very cool thanks for the effort!
add_RainTPL
test --recurse, include, exclude
added universal list feature, added song list
Persistant server connections.
Support compression.
Decode text encoding to utf-8.
DNS cache.
Non text result aware.
Started integrating feedback.
keep student emplids up-to-date
Don't use emplace_back for wxDataViewItemArray since it doesn't work in non-STL builds
Make AssStyle::UpdateData and GetSSAText less weird
Use the C++ versions of C headers
Kill the #ifndef AGI_PRE guards

They don't actually improve compilation performance and make it more
annoying to modify what things are in the precompiled header.
Don't include wx/wx.h in subs_grid.h
Remove things used in one (or zero) files from agi_pre.h
Move the project configurations to aegisub.props
Replace field_setter with a lambda
Refactor time ctrl handling in SubsEditBox
Extract some duplicated code for the margin controls
Move the Margin controls to an array
Remove the pad argument from GetMarginString

It's no longer ever actually set to true.
Replace SubsEditBox::OnUndoTimer with a lambda
Store parsed dialogue blocks in a ptr_vector

This eliminates the need to explicitly delete the parsed blocks.

Also go ahead and remove AssDialogue::Blocks since it's really not a
very good idea in general.
Drop the position argument from ProcessParametersCallback since nothing needs it
Document a few things and kill all remaining placeholders
Relicense all of my stuff that's still 3-BSD to ISC
Update LICENSE
Use lambdas for very short event handlers
Use iota rather than partial sum
initialize whichTLBPage = 0 in kernel.h
fixed vundle dirs, just need run install from vim to get them back
Fixing map scaling
Merge branch 'master' of https://github.com/Akrome/cs424-p4.git
o Load the image format from metadata.json
Provide Installation Instructions Supporting Multiple Environments

Provide Ramp installation instructions, including instructions for
setting up multiple environments (e.g., production, testing, and
demo environments), each of which may have a different database,
set of menus, or color scheme.  Support differences in data, menus,
and color schemes among environments.  Specifically:

- Provide new INSTALL.txt file in installation directory; make minor
  updates to INSTALL_DB.txt and README.txt to reflect new INSTALL.txt.

- Rename application.ini to applicationTemplate.ini so that future
  software updates will not overwrite user-customized application.ini
  files.

- Comment out setting of APPLICATION_ENV in .htaccess, which was
  overriding settings coming from vhosts.

- Re-organize cascading stylesheets in public/css to allow different
  APPLICATION_ENV environments to have different color schemes.

- Define menu items in menu configuration files specific to the
  APPLICATION_ENV environment rather than in IndexController.  Create
  new menus for different environments.

- Create About files for Ramp and Smart.

- Move several table settings from the top-level settings directory
  down to appropriate sub-directories.
Added exception handling into WindowViewModelHelper. Updated AddNewCustomWindow to be better 'layed out'.
HTML and XML reports updated with the option to not include HTTP response bodies. [Issue #296]
added --trace flag to rake install
master test added
Fix for temporary generic return type association for sake of linearization
Merge Tracking
Fix crash long-tapping thread in list.

Custom tab bars wreck everything.
Fix crash opening thread without current username.

Notifications triggered in getters that cause more getting means an
infinite loop.
Mark thread as seen when reading a page of it.

Otherwise we're waiting for a thread list reload.
Update posts view background on dark theme change.

Otherwise it gets stuck and it's quite blinding when pulling for next page.
Only auto-refresh if the Forums are reachable.

No point spamming network errors.
Show no network errors when reading cached posts.

There's no point spamming with network errors. Manual refresh actions, or
attempts to load a page with no cached posts, will show a network error.
Theme pull-up-for-next-page text, arrow, spinner.

Easier to see in light mode, with a spinner matching the posts view
"loading" spinner.
Alignment bump.

On iPad portrait, "pull to refresh" and "end of the thread" were two points
out of alignment. Just off enough to be annoying.
Restyle settings view in dark mode.

The darker borders are a lot less gaudy.
Ellipsise YOSPOS posts action button.

Matches the normal posts action button.
Update Default*.png.
Prepend / to relative image URLs.

Otherwise we turn attachment.php into example.comattachment.php.
Exclude more thread tags from no images setting.

They're like emoticons, we just missed a few.
Fix tab bar hiding behind content.

It would simply disappear when a new view controller got pushed that wanted
it hidden.
Shorten some code.

Unnecessarily long, does the same thing.
Bundle version bump.

iTunes Connect rejected 19 and 20.
gitignore sublime-workspaces, and fix the sublime-project to have a relative path
removed text overflow styling from header
- Changed serialisation options to separate read/write options
- Changed string parse method to use scanCharactersFromSet:intoString: to avoid bug in NSScanner
- Tided up writer
- Updated tests
- Updated project file
removed section on Installing via pip and PyPI
Revert "Kommentar eingefügt"

This reverts commit 1cecc6cf94b1de7675be452ac38ad269ca028298.
Revert "Revert "Kommentar eingefügt""

This reverts commit 516c4d25d15168b151a4ddc41f11e9adf9c0964a.
Revert "Revert "Revert "Kommentar eingefügt"""

This reverts commit e119dfd328e0051c74f0fc861630eb829275a5b8.
Add Instruction About Sending Email
Update scm_breeze to latest
mumble: push the correct patch from mixi
Change variable data type.
wfreerdp-server: improved peer tracking, added ability to disconnect individual peers
nada
Merge branch 'master' of https://github.com/CICM/HoaLibrary

Conflicts:
	sdk-build/hoa.stereo~.maxhelp
Ня... ^___^
corrected parsing to items loop
Merge pull request #7 from tecto/master

moved parse code to item loop
Removed Unwanted Themes
Translated some Swedish...
Facebook SDK v1.2
[Fix] QuincyKit
[Fix] FXImageView (1.2.3)
Merge pull request #665 from snod/master

adds FXImageView to pods
Fix MessagePack spec