labofsahil/github-event-dataset-2012 huggingface dataset:
some changes to commands
Added commands to pull data from python properly and some initial rework on combat service
more changes to combat, refining the accuracy stage, and moving on to defenses and damage calcs, basic attack still has no cooldown.
made some combat changes on wrong branch
Skills and skill mods now load.
More commits.
updated get network lists to return by reference so they properly get cleared out
attributes properly being set for combat command in python
added range check and updated filters
Made network containers truly thread safe...
fixe merge conflict
fix get slot object and error in attribute recursive
fix some bugs in Attributes and fix boost log
Changes. Need to go fix network containers
small fixes, added in a max range before you are removed from combat
first crack at banking, almost done through radials, player service not being grabbed properly, perhaps a clean is needed )
bank deposit opening properly
Banks are Done Issue#451
Fixed object interfaces to avoid returning network containers.
Merge branch 'fixes/network_containers' into feature/skill_mod_manager
Installation des packages uniquement en validant manuellement une classe
Fix constraint management in TwigQuery #53
Remove the -s (silent) flag from make invokation to help troubleshoot the build.
added camera & respawn ability
add other types
graph is fixed
color picker works
rm
formatting
Clean up miscellanea in r2.lib.

Remove some unused files and move some tests to the test tree.
upload_static: Use dictionary comprehension for readability.
Upgrade passwords on log in when bcrypt work factor changed.

Previously, only old-style SHA-1 passwords were upgraded on login. Now,
if we change the bcrypt work factor, bcrypted passwords will also get
the upgrade treatment.
new couch_core
In this updated :
+ added complied in release mode statically linked library
+ added main.cpp - simple example program
+ updated licences to FreeBSD
Add Keith Rarick's C implementation.
Original repo: https://github.com/kr/clich
Implemented Optimistic Locking in Eloquent ORM.

Signed-off-by: René Moser <mail@renemoser.net>
1)More info for README.md 2) Revised redirect for nonexistent tags.
build-3

bug-fixes, substituição da biblioteca _underline por knockout em
sections - TODO
Added widgetFontSize, widgetPosition and widgetAlign to ofxUICanvas and ofxWidgetPosition to ofxUI
Condensed code from addWidgetDown, addWidgetUp, addWidgetLeft and addWidgetRight on addWidgetPosition
Added addSpacer to ofxUICanvas, condensed the ofxUISpacer constructors and updated all sample projects.
Removed empty constructor from ofxUISpacer
Merge pull request #39 from camilosw/CompactSyntax2

Added addSpacer method to ofxUICanvas
fixed ofxUICustomization example crashing
added Compact Syntax Example
Added addSlider and addFPSSlider to ofxUICanvas, condensed the ofxUISlider and ofxUIFPSSlider constructor, reduced the parameters of ofxUIFPSSlider, updated all sample projects and removed unused code from two sample projects.
Merge branch 'develop' into CompactSyntax2
added clearSelected() feature to ofxUIDropDownList
fixed ofxUIMultiImageButton and Toggle from crashing upon creation and updated them for variable binding
Merge pull request #43 from obviousjim/develop

added clearSelected() feature to ofxUIDropDownList
Restored previous constructors on ofxUISlider to maintain backward compatibility and added a warning on them.
cleaned up develop branch to prepare for CompactSyntax Branch
fixed ofxUIImageSlider to work with variable binding
fixed example-ofxUIMoreWidgets to compile and work properly
fixed ofxUINumberDialer to be more precise and give more feedback to the user
Added addRangeSlider, addRadio, addButton, addToggle, add2DPad and addTextInput to ofxUICanvas. Restored previous constructors to ofxUIFPSSlider. Updated example-ofxUIAllWidgets.
cleaned up repo for merging with compact
merged compact with develop branch
MDL-25695 wiki: enable anchor tags
MDL-32203 completion: Fix issues with data object where clauses
MDL-31814 question bank: fix possible error with sort columns.
MDL-24401: fixed string for adding content page
MDL-32861 filemanager: respect course upload limit
MDL-31393 qtype_essay upgrade: save old question_answers.feebdack
MDL-31458 forum: email subjects containing ampersand are sent as &amp;
MDL-32633 quiz editing: recreate grade item when max changed from 0
MDL-32714 workshop: fixed SQL to load assessment form fields

Obvious problems emerged once there were some records in the
workshopform_rubric table with no workshopform_rubric_levels. As l.id
(empty in that case) was used as the key of the returned array, they all
were collapsed into a single one.
MDL-32915 fix bogus open div in basic chat ui
MDL-31719 lang/en/admin.php: changes text in $string['configallowthemechangeonurl'] to make less ambiguous
MDL-29399 theme_boxxie: fixes page-mod-assignment-view when editing
MDL-32872 tool_roles: Fixed up navigation on user roles page
MDL-32611 editcategory: Fixed up navigation error.
MDL-32126 - data - backport of advanced search re-write
MDL-32340 Improve performance of calendar selection
Merge branch 'MDL-32714-rubric_21' of git://github.com/mudrd8mz/moodle into MOODLE_21_STABLE
MDL-32863 question: fix for Oracle ambiguous column error
Merge branch 'wip-MDL-32611-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE
Merge branch 'wip-MDL-32872-m21' of git://github.com/samhemelryk/moodle into MOODLE_21_STABLE
step01

Signed-off-by: Joseph Rézeau <moodle@rezeau.org>
Fixing main logo
Optimize curve drawing.
Rewrote all tests to separate test for each option
Added docblocks
Added missing configuration options to UTCW_Config
Docblocks
correct usage of PluginManager
Update TODO.md

Added Stack Overflow to the TODO list. Closes #139
sheetsj claiming color #d75701
Fixed merge conflict
Added Jeiting's pic
Updated todo.
Added nice function to deal with encapsulated globals.
Started new addressing module.
ViewUtil.position is renamed to View.locateAt and also enhanced to be able to locate to any other view
Enhance _StyleImpl s.t. view.style.left/top/width/height/cssText can be used
Updated the url for annotated source code page
archivos de helpers
readme : removing a known issue that is now resolved w/ library filtering
Revert "Make module_handle_t a pointer to an opaque type instead of a void*."

This broke the build on Windows.  We have a lot of code that assumes
conversion between HMODULE, app_pc, and module_handle_t.  I'll have to
re-evaluate this tomorrow.

git-svn-id: https://dynamorio.googlecode.com/svn/trunk@1317 49cc7528-f6fd-11dd-9d1a-b59b2e1864b6
Update PhobosDoc
Cleared up the final conflicts
changed readme
changed process name to web.js
added simple form for getting basic relevance info
Added travis build info to readme
ByteArray: fix off-by-one assertion, and position set twice bug
SoundChannel: exit 0, to be usable in batch mode
Amiga: adapt memory to 86 KB to be able to play all FC tunes
FCPlayer: adjust buffer sizes to that all tunes work
FCPlayer: fix some uncaught OOB accesses by buggy tunes

now every tune in my collection plays successfully, tho at least
paralax.fc3 seems to miss around 10 seconds of the lead voice
from 0:33 - 0:44.
update README
Push test with learning rate 2e-3, minibatch size 10, 200 epochs pretraining
Repair after every 5th minibatch
L1 scaling is 9e-2, 400 sparse coding units,
encoding_feature_extraction_dictionary rows are normalized to 1.25/(num_ista_iterations + 1)
only read basic branches
Modify layout app
pluginlib 1.8.3
added DEBUG option
sigmac_max added
error for rigid matrix evaluated
remove <pre> tag because it does not work
Improvements and additions to OLI datasets.
Add rotational force

* Rotation about vertical axis (for now)
* Taylor number is an additional input
finally compiling!
Optimizations and more configurable options to session handling
RSence-pre 2.3.0.13
Remove an unused macro.
Fix Shexy.wait_for_ssh

It was calling Shexy.tcp_test_ssh with invalid arguments
Shexy 0.3.2
* Adjusted the desired minimal apk size for JRuby 1.6.7 to 3.2MB
add screen lock and terminal shortcuts
link to gist that started it in readme
Add support for asking the user for a filename
Trying to work around what I suspect is an eventual consistency issue with spot instances
change in FlatDB download site
docs & changelog for rdm plugin
-n option for random command (#24)
Added NamedClass
Some more changes.

Signed-off-by: Saptarshi Mandal <sapta.iitkgp@gmail.com>
Force int type for --irc-port.
Closes #3.
Added -lm for shineenc LDFLAGS, removed one global.
Initialize config before inspecting it..
added missing require for httpclient
added integration specs for ssl authentication

for whatever reason, em_http doesn't seem to support this feature.

need to investigate why and maybe raise when someone tries to use
ssl auth with em_http instead of silently ignoring the setting.
Make SSL work with httpclient adapter

Trusted CA certificates must be set with SSLConfig#add_trust_ca.
SSLConfig#client_ca is for SSL Server setting so meaningless for SSL
client.  I must have not added the property... (I used the class as
well for SSL Server.)

By the way, ca_cert_file usualy contains multiple certificates (cat
*.pem > ca_cert_file.pem) so Auth::SSL#cert_file should be useless, too.
Better check other adapter impls.

Thanks for using httpclient as an adapter!

Conflicts:
	lib/httpi/adapter/httpclient.rb
	spec/httpi/adapter/httpclient_spec.rb
update http clients
renamed global :convert_tags_to option

to :convert_response_tags_to as it only affects how Nori translates
SOAP response tags to Hash keys.
added global :convert_request_keys_to option

uses Gyoku 1.0 to get rid of global state. the new option replaces
the need to use Gyoku.convert_symbols_to.
Added hits plotting
Merge pull request #2 from sawjlab/simon-shower

Add ability to make hit map histograms to the shower counter
Add dotfiles.rb utility
Merge branch 'master' of github.com:schemacs/gist
forgot to add 'new' package labyrinth o_O
Use compile-time pthread support
small performance enhancements
cleanup
passport authentication example
change nav generator from double to single quotes
client route updates
mongodb datatypes
client routes and small fixes
connect outlets
hardcoded url in redirectTo removed
Implement MetadataTable.GetRowCount
added Makefile.buildbot with custom script to build the debian package
Task #400 Review GMST access
everything uses find now
handle NCC flag
fixing some unrelated warnings
fix the race selection escape crash
re-use the texture across preview instances
oops
Merge branch 'master' into next
per NPC ID interaction tracking
book skillgain
change books to RecListWithIDT
fix the race selection escape crash
re-use the texture across preview instances
oops
fix the weather not changing when sleeping/waiting
Merge branch 'next' of https://github.com/zinnschlag/openmw into next
fix the global map updating when pinned
Merge remote-tracking branch 'scrawl/book_skillgain' into next
Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation

Conflicts:
	apps/openmw/mwgui/dialogue.cpp
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
Merge branch 'decouple' of https://github.com/zinnschlag/openmw into inputsystem
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
Input system rewrite
OSX suggestion by corristo
key defaults specified in the code now, required in order to keep the configuration files valid across multiple versions of openmw
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
hotkey window first version
"reset to defaults" button, invert y axis button
UI cursor & camera sensitivity sliders
use float for the mouse position tracking, should be more accurate for sensitivity multipliers != 1
Merge branch 'master' of https://github.com/zinnschlag/openmw into inputsystem
Issue #361: reset skill level in race selection stage
resolving conflicts
still resolving
Use debug dlls when debugging in vs2010 (try 2)

Using the Debug build in vs2010 is not working because the debug dlls are
not loaded when debugging. The reason they are not loaded is that
CMAKE_BUILD_TYPE is not defined when doing multiple builds. This in turns
causes OGRE_PLUGIN_DEBUG_SUFFIX not to be set. This patch makes sure that
OGRE_PLUGIN_DEBUG_SUFFIX is always set but only used when debugging.

It also defines DEBUG to make it easier turn things on and off when
debugging.

There are still other bugs that have broken Debug mode in vs2010 but those
will be addressed in other patches.
use the same height on non-1st person modes
entering vanity mode
no vanity in gui mode (thanks scrawl)
update camera code, add idle time
Parsing Works like a bauss

Need to implement Signal broken pipe handler + concurrency+ caching
vim: Move autocmds into augroups
vim: convert map to noremap
vim: remove unused buflist plugin and mappings
add seajs 1.1.9
update seajs to 1.1.9
Remove extraneous '.'

Closes #13.
fix file-separator problem
fix output folder
update website
bugfix dep extension
import Data.Maybe
update website
Add a config option to not use URL rewriting by default

Also fix a bug preventing download
Fix download without X-Accel-Redirect
Fix HTML catalog when more than 2 prefered format are available
Fix for php5.4
texture for todays party
Merge branch 'master' of github.com:sebseb7/lun1k
adding handlers for controller input
Fix 'finalize' issue in #'$object'{} state
Tests for global, object, unicode
Update CHANGELOG
Merge branch 'dev' into galaxy
Wrap quickfix text line longer than the width of the window.
Add the `is_multiline` attribute to candidates.
Update url to phpseclib
improved file structure
Merge branch 'master' of github.com:shanef/redrum
support all keysyms defined in <X11/keysymdef.h>
add scene titles
Ensure propagation of errors in http module.
When an error occurs in the core http module, an error event is emitted by a request object. For knox client's putFile, putStream, readFile, etc. the caller does not get a reference to the request object and does not get a chance to catch errors occuring in http module except through a global error handler. This change ensures errors occuring in the underlying http module are propagated through the callback function.
Adds Docs
Little refactoring library structure
Merge branch 'master' of https://github.com/siciarek/laaf

Conflicts:
	lib/LAAF/Config.class.php
Fully functional segment checking.
Thread abstraction for wait on condition variables now has timeouts.
Sweet dynamic include path generation in makefile.
lang.php generator. Temp fix in r_add_user.php ($id_locale did not exist).
Add generated file warning
Revert "working drawParam changes for VE/VPS VY/VTE"

This reverts commit 16f684548d75fc6e431e75782d322f3ec7055e3e.
fixed differences, ready for merge
added VE to model
#131 Moving plugin actions to a separate controller.
test to find bug
when adding new path, delete existing path
Modifying .gitignore_global.
added partially ported code
made it up to link errors :P
Added change method and changed "path" to "query"
Added first test for the extension module #5
Rearranged code
Merge pull request #12 from skidding/refactor-extension

Refactor extension
Synchronise with scripts from LQ.
Platform agnostic builds continued

Details:
-added pom.xml for maven builds
-moved resources to src/main/resources
-modified build.xml copy resources correct
-updated README
-tested builds and execution in ant, mvn, Eclipse, and IntelliJ
MDL-32323 add windows test database init script
changes necessary to get 'cabal sdist' working
removed some TODOs ;-)
Adding a static lib for OS X. This work is incomplete, and some methods do not work correctly. For example, the view screenshotting code mimics the iOS behavior and draws all the windows on top of one another. The purpose of this commit is to propose a general structure of how the iOS and Mac code will live together.
Separating KeyboardCommand into IOSKeyboardCommand and OSXKeyboardCommand, and change extractInstanceFrom* methods to take platform-appropriate types instead of id
specify ~>0.3.5 for xcodeproj gem (0.4 causes breakages due to API incompatibility)
frank-cucumber version bump
replace 1.9-specific syntax with 1.8 compatible syntax
Fix for xcodeproj 0.4.0

Change xcodeproj build_configuration call to build settings
Merge remote-tracking branch 'FutureWorkshops/xcodeproj_fix'
open up xcodeproj version lock, and version bump
Merge branch 'mac' of github.com:MichaelBuckley/Frank
version bump: promote 1.1.3.pre1 to 1.1.3
Fix regression in DumpCommand

introduced while fixing a compiler warning in using a Class as a
NSDictionary key
new build of static libraries
Merge remote-tracking branch 'upstream/master'

Conflicts:
	gem/lib/frank-cucumber/rect.rb
refined error message
added config switch to turn off the error message when trying to execute a command that did not exist
Changed TagHandler to accept a string docblock instead of a reflector.
zforcommit
修改提取数据库数据的循环判断逻辑
Add lens image
Fixing STATIC_URL (missing slash)
DEBUG mode from environmental vars
Fixed banners
DiscoveryYear for ElementData
FusionHeat and VaporizationHeat added to ElementData
Added an assistant page as the initial and default service view.

Signed-off-by: Snakevil Zen <zsnakevil@gmail.com>
Fixed spacing between font elements.
[KARAF-1666] Fixed another jetty problem with acceptors and blocking connectors

Signed-off-by: Andreas Pieber <anpieber@gmail.com>
(cherry picked from commit 86f1a4a5a48df77ae14b5cb8403dde2cc92760a7)

Signed-off-by: Andreas Pieber <anpieber@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/karaf/branches/karaf-2.2.x@1368387 13f79535-47bb-0310-9956-ffa450edef68
Fixed createPlugin from wires.
Router plugin in prgress.
Router in progress.
Router plugin in progress.
Router plugin in progress.
HasEventListener fix to framework elements.
Merge branch 'master-dev' of github.com:somajs/somajs into master-dev
Dispatcher tests null and undefined added.
Router relative in progress.
SomaRouter in progress.
SomaRouter plugin cleaning.
SomaRouter plugin unit tests in progress.
Soma router tests done.
Router plugin update to Davis.js 0.9.0
Build v1.0.2
Router plugin demo update
Update to v1.0.2
mark release 120715
Move bootstrap pointer to github now that that is working again
--cache for sm try
sm save with sm-catalog.json support
updated catalog
optimized plural handling
Last version of demo
AST reached fixpoint git add fsafe.ml
Added fresh variable generator
Last parsing iteration
Merge branch 'demo' of github.com:sperca/F-Safe into demo
Updated Makefile
Merged som files from callgraph branch to demo branch
Last version of pprinter in demo branch
new ast integrated into callgraph.ml
Merge branch 'demo' of github.com:sperca/F-Safe into demo
trying md format
move encode/decode functions into static BBCode members. Clean up some more code
WIP adding support for stream
fixed issues caused by eclipse auto-format and << in template settings
removed setw from non-numeric stream operations
added forwards for eval and operator() for DVE
added get_function to DVE
improved tests and simplifications
return Next line # Attempts to ...
Navigation and controllers

Added navigation, beginning of controllers, etc
Mala uprava
Test git 1.
checking that getenv('os') returns a string otherwise invalid offset warning is issued because of the substring
Merge branch 'master' of git://github.com/zendframework/zf2
fixing broken merge
Merge branch 'master' of git://github.com/zendframework/zf2
making table name optional in logger\writer\db constructor, but checking that both table name and db have been sent in constructor and throwing exceptions if not
Get rid of error suppression

- Thanks to intiilapa (Benoit Durand)
- grep -r "@" library/Zend/ | grep -v "*" | grep -v "// @" used to
  identify suppressions
- Used ErrorHandler to remove suppressions
CS fixes

- trailing whitespace
allowing uriHandler to be specified as class name and thus lazy-loaded
[#2210] Remove error_get_last usage

- Removed two cases where error_get_last() was being used in Cache
  component; instead, captures the return from ErrorHandler::stop() and
  calls its getMessage() method.
Merge branch 'hotfix/making-tablename-in-logger-db-constructor-optional' of https://github.com/arse/zf2
[#2209] CS review

- Incorporate feedback from issue comments
- Ensure CS is followed
- Added assertions to testPassingTableNameAsArgIsOK()
- Simplified messages in expected exception matching in new tests
Merge branch 'feature/allow-uri-validator-lazyloading' of https://github.com/shevron/zf2
[#2211] add class_exists check
[#2210] Pass ErrorHandler::stop() result as previous exception

- Per @mark-mabe
- Any place where an exception is throw immediately following an
  ErrorHandler::stop() call should pass the result of that call as the previous
  exception.
Zend\Db: First integration tests for sqlsrv
Zend\Db: Force fail for Sqlsrv integration tests when missing variables
Merge pull request #2210 from weierophinney/hotfix/remove-suppression-operator

Get rid of error suppression
[ZF2-479] Zend\Db\Sql : Handling of null value on query mode Execute
Zend\Db: Fixed up docblocks and Pdo & Mysqli statement initialization
CS fixes : trailing_space & elseif
Better plotting of vertical lines
Merge branch 'release/1.3093' into devel
fix bug #751
updated changes
Merge branch 'exceptions_and_hooks' into devel
Update 'before' hook doco

* BUGFIX: document that the hook gets a sub-ref argument
    commit 03665072c2660ea79b0eb2d58dd57ba398b149ef seems
    to have got lost somewhere
* clarify that a naked 'before' is deprecated
Merge pull request #754 from DrHyde/devel

Update 'before' hook doco
Explain in POD that if there are multiple fields with the same name, params('fieldname') returns an arrayref of them
fix dancer exception composition, and message pattern application
small code enhancement
small code enhancement
updated CHANGES
Merge branch 'fix/exception_composition' into devel
Create failing test to show error with testing response headers
Make sure the request is properly converted to a response.

Sometimes we already have a response object. This fix makes sure that we
consistently recognize it as a response object and behave accordingly.
updated CHANGES
Merge branch 'review/ovid' into devel
Bike-shedding 101: Don't use ref() to check and isa() relationship.

I was considering subclasses the Dancer::Response object in some tests. This
would have caused very confusing failures.
Add Ovid to authors, per dams comment
Merge pull request #759 from Ovid/devel

Devel
Allow the config optionally return objects instead of hashrefs.
Merge branch 'release/1.3096' into devel
new test plugin for home-made hooks
Support for register_hook and execute_hooks in Dancer::Plugin

This is syntactic sugar for wrapping the factory calls needed to declare and
run hooks from within plugin.

These keywords are provided to mimic the API of Dancer 2 so that plugin
migration can be done more easily.

A test is provided to demonstrate the patch.
add POD for register_hook and execute_hooks
reflect CHANGES
Merge branch 'topic/hooks-in-plugins' into devel
version bump
update MANIFEST and MANIFEST.SKIP
set changes
Merge branch 'release/1.3097'
roff: also indent block_code just like block_quote
暂存
暂存
继续暂存
修改角色动画播放方式，添加角色Avatar
Merge branch 'Branch_EditActor'

Conflicts:
	Demo/GameFramework/Actors/ActorEntity.cpp
	Demo/GameFramework/Actors/ActorEntity.h
	Demo/Resources/scene.bin
	RemoveBom.bat
修改点击NPC的检测方式
Just use a single pushInsteadOf for GitHub
Updated source headers with current version, doc and CHANGELOG updates.
added rebase strategy with autosquash
stop watching SCM status
light up zsh
Hmm, would have helped if I would have used the activesupport gemspec and not the actionpack version
CairoColor: fix range as float to do premult and demult operations properly
target_cairo_png: replace info message by warning when error has occurred.
Rectangle: initial version of accelerated_cairorender. It works fine for non inverted rectangles but doesn't work properly for inverted rectangles yet. Blending modes not fully supported.
change system status
update image_tj
Merge branch 'master' of github.com:szpapas/iChad
typo
Merge pull request #2 from schmurfy/patch-1

typo fixed
占いや数字を追加しました。
Added caching to view switching: fixed switching from map
Benchmarking app ready for deployment on the farm
Defined time interface.
Implemented timer using Hardware timer 1
add shutdown hook to DoveMQBrokerDriver
Refactored bashrc a bit
add another image

daily
Only send double tap event on 2 taps
Rename Import -> Pull.
More API thoughts
More diagnostic output for Window failures.
Must encode when priting to the pager, and note when printing to a GLOB.
Update changes for v0.80.
Have `bundle` copy scripts in subdirectories.

This is a bug fix. Previously, `bundle` would copy scripts to the top-level of
the deploy, revert, and test directories. Then, when running `sqitch deploy`
in the bundled directory, Sqitch sould not be able to find the scripts! So use
the new `path_segments()` method added in 162473b to generate the bundle
destination paths, rather than the base name of the scripts.

This commit includes tests for this functionality.
Ensure that memory allocated by the special malloc is freed in the presence of exceptions from thrust::sort.
Merge pull request #294 from jaredhoberock/fallback_allocator

Ensure that memory allocated by the special malloc is freed in the prese...
Use host_system_tag instead of cpp::tag to implement vector equal.
Merge pull request #200 from jaredhoberock/fix-issue-174

Use host_system_tag instead of cpp::tag to implement vector equal.
Fixed "bringAppToFront" behavior
Released app to play store. (with all required assets)
Made app work for multiple Android API versions.
Added menu and local storage examples
Added week 5 final code
Added week 6
Merge branch 'master' of https://github.com/rioleo/CS147
added custom lighthouse image
mom-47 Fix libFMS to compile with gfortran 4.7
Merge branch 'master' into mom-36
mom-36 Remove unused variables
minor readme fixes

Signed-off-by: Tim Henderson <tim.tadh@gmail.com>
fix mock resources according to latest catkin_pkg
Add decode stub
Thread: Test interruption.
Typo.
Merge branch 'master' of https://github.com/MythTV/mythtv
Add pretty representation to BitwiseEnum type.
Correct reversed date processing for DictData class.
Move dictionary-like classes into utility module.
Merge branch 'master' of https://github.com/MythTV/mythtv
Optimize transition lookup for timezone handling in Python bindings.

This modifies the transition lookup for timezone handling classes to
start the search from the last used transition, rather than starting
from the beginning of the list each time.
Merge branch 'master' of https://github.com/MythTV/mythtv
Revert Matroska MIME to 'video/x-matroska'.

If different clients are expecting different MIME times, the only
sensible solution is to use the one dictated by Matroska.

http://matroska.org/technical/specs/notes.html#MIME
Refs #8643
Fixes #10980
Update the Slovene translation of mythweather.

Signed-off-by: Kenni Lund <kenni@mythtv.org>
Update the binary translation file for the Slovene translation of mythweather.

Fixes #11076.
Fix UTC issues dealing with program.originalairdate.

These were missed earlier.  Thanks to Jim Stichnoth for spotting the
problem.
Update Spanish/Spain MythFrontend translation
from Antonio Marcos Lopez Alonso

Thank you Antonio!

Closes #11083

Signed-off-by: Nicolas Riendeau <nriendeau@mythtv.org>
Actually mute the mixer when using ALSA.
If a job is marked as errored then it is NOT running. Fixes failed jobs being shown as permanently in the 'run' state.
Revert "If a job is marked as errored then it is NOT running. Fixes
failed jobs being shown as permanently in the 'run' state."

Didn't mean to push this, it's not even correct.

This reverts commit 1ba571f0fbeb939a26e85beee74920cf941e6369.
Merge branch 'master' of https://github.com/MythTV/mythtv
Fixes #11072.  Improve cc708 thread safety.

There still appear to be potential race conditions, which can be fixed
by adding more locking.  However, this will have an unknown
performance impact, so we'll address it after the release.
Refs #10984.

Signed-off-by: Jim Stichnoth <jstichnoth@mythtv.org>
Merge branch 'master' of https://github.com/MythTV/mythtv
Reinitialize database session variables when reconnecting.

The session variables weren't being set when we reconnected after a
database connection went stale and led to problems.  For example, the
timezone was not being set to UTC and caused serious scheduling
problems for users in far eastern time zones.  Thanks to Adrian Saul
for initially spotting and then tracking down the problem.

Fixes #11086
Use speex from master branch

Change-Id: I7e2383af0ea599c1ace6b9baaee81d4ceacb8a03
formatting fixes in  about page
Aritmetické operace, volání(není hotové viz. todo) a návrat z funkce.
added commenter bundle
uniform blocks support
version change: skipped 0.5 was mpi, 0.6 is scalapack
doumentation can be generated
Ensure 'formatoptions' includes t

Partially addresses #10.
Added Djangocon Europe video reference in README
Correct state transition name to reflect StateMachine state nesting.
Runs current runloop on final checkbox test to keep it from leaking into other tests.
Will remove when https://github.com/emberjs/ember.js/issues/838 is done.
write to s3 without file
run task
context: gzip compression for more types

Add gzip compression support for more content types including
JSON, RSS, ATOM, RDF
Start nesting at 0 instead of -1 and rather adapt the formatters
Merge pull request #55 from sol/use-a-tree-for-spec

Start nesting at 0 instead of -1 and rather adapt the formatters
ft=lang support
Bump versions.
Relax dependency on containers.
Bump version to 1.16.0
Add GHC build files to .gitignore.
Update unix dependency.
Fix bug where ghc-options would be ignored in profiling/shared builds
Initialise the 'jobs' config file setting with the current number of CPU cores.

Fixes #982. Additionally, running 'install -j' without the numerical argument
will have the same effect at runtime.

Side effect: 'install -jNUM' doesn't work when there's a space between -j and
NUM.
Merge: change default number of jobs in the default config
Update bootstrap.sh to match platform 2012.2.0.0

Contributed by Tuncer Ayaz.
Make 'viewAsFieldDescr' a total function.

Fixes #980 by allowing to create config fields from options with optional
arguments. Without this change, setting the 'jobs' or 'verbose' fields in the
config file results in a fatal error on startup.
Merge with cabal-1.16
Faster cabal update

Contributed by Hideyuki Tanaka.
Merge branch 'opt-arg-config' of https://github.com/23Skidoo/cabal
Move 'writeFileAtomic' from D.C.Utils to D.S.Utils.
Automatically run 'configure' before 'build'.

Change the behavior of 'cabal build' to automatically run 'cabal
configure' if the package in the current directory has never been
configured or if the configuration is outdated. In the former case, test
suites and benchmarks are enabled because 'cabal test' and 'cabal bench'
will soon imply 'cabal build'. In the latter case, the options from the
most recent configuration are reused.
'cabal test' implies 'cabal build'.
'cabal bench' implies 'cabal build'.
nu med check/uncheck
Implemented page creator list for id's that contain epub syntax; only these will display the Start button.
Filehandler class created
Squashed a few gameplay bugs. Added cheats.

Shake to cheat (naughty naughty)
ch 27: listings 27-1 and 27-2
ch 28: demo_clone.c

This is the demo_clone.c program from the book's website, which I've renamed
to listing_28-3a since it is a better demonstration of clone().
rename s:do_enter_no_egglike() to s:do_enter_egglike()
/list doesn't consume reaction skills
Most recent log entries API function
Recent URLs decoration for header bar
Added links up.
simplified taxon_concepts_controller
removed blank lines in the end of the file
Merge branch 'master' of github.com:unepwcmc/SAPI
sql wip
Merge remote-tracking branch 'etmc/master' into alignment_configuration
some leftover bugs in check_xchange for XYZT parallelisation
BG xlc compiler does not support #pragma once!
Merge pull request #75 from deuzeman/alignment_configuration

Alignment configuration
added function get_pid_max() to detect the maximum pid value
Fix: replace missing memrchr function on OS X
Completed the iterator for OSX.
Fix erroneous Makefile in tests/
Fixed some pointer fails in process_iterator_apple.c
process->cputime should be millisecons now
Merge pull request #9 from opsengine/issue_6

Added function get_pid_max() to detect the maximum pid value
process->cputime is really milliseconds this time.
Silence EPERM and ESRCH errors in get_process_pti
Fixed errors, OSX build now passes all tests.
Merge pull request #10 from urdh/osx-support

OS X support
fixed compilation issue on OS X
added OS X instructions to README
Some old scripts.
Merge branch 'master' of github.com:uuner/sedtris
Removed readme.
window+1connection
Implemented add() in FrequencyMap. Some other fixes.
added calls to ROCGraph methods.
Created class for geenerating the ROC graph.
test: duffing: add lyapunov exponent test
Merge branch 'master' of github.com:venik/phd_src
#6 - log4j
preliminaries actor almost finished. no pictures
Reworked avatars a bit to work better with Gravatar.

Reworked avatars a bit to work better with Gravatar.
Reverted to old version of pubnub to fix bugs.
删除一些不必要的提交文件
Adding --LINK=$(LINKER) for ghdl1.

Now ghdl doesn't build fine.
removing unwanted file
updating mvn config
First macro added.
Merge branch 'master' of https://github.com/vjovanov/mpde
Accounts links and privacy
Terms of Use link
Added required field
Updated Bootsy
Theming
hide send_clipboard_button
menu fix, connectionManager fix
ads remove && commandsList fix
connection fix
connection fix, preferences add
removed extra linebreaks
+ Dummy project
in process spawning, provide the option of maintaining a copy of both ends the pipe/stream connected to a process, or none at all (unix only)
Merge branch 'master' of https://github.com/joyent/libuv into HEAD
fixing of random generator
menucss7
Changed catalog name key to _CatalogName. Write this key also to the raw (non-branch) local catalog.
test
Merge branch 'gh-pages' of https://github.com/wdi2/students into gh-pages
foundation assets added
spieler 2 kommt zur game.xhtml
remove db from examples
start to introduce mongoDB as memory is now a big shortage on node side...
for testing purposes there is a simplified file storage as well...
Merge branch 'master' of https://github.com/webgme/webgme
dodane kategorie
Merge branch 'master' of github.com:weedsthe/food
添加了邮件提醒功能
Dojo 1.8.1

Dojo 1.8.1
fixing /evo/info/ link header
Merge branch 'develop' of github.com:wf4ever/rosrs into develop
fixing problem with relative URIs in copy operation
Fix regression in release script (#109)

printf "-dev" was seeing -d as an option
restview's style is ok
contains item
Commented some unused variables
allowing objects to receive events at their current simulation
time without rolling back
add the update part made by lmt
use add_command()
coding standards
more appropriate error message for reserved blog names
extract add_initial_markdown() procedure
extract call_ronn() procedure
call ronn for top level commands too
don't use SHOW TABLES, as HyperDB doesn't seem to like it
removing outdated source

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@136767 a5903396-d722-0410-b921-86c7d4935375
migrating source from scratch

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@136769 a5903396-d722-0410-b921-86c7d4935375
Reverting r131795 from beta branch

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131881 a5903396-d722-0410-b921-86c7d4935375
WADL model was added to GReg as OOTB support

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131882 a5903396-d722-0410-b921-86c7d4935375
version correction and select iamge feture addition

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131883 a5903396-d722-0410-b921-86c7d4935375
value type level validation added to the property mediator as reported in jira  https://wso2.org/jira/browse/ESBJAVA-1057

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132760 a5903396-d722-0410-b921-86c7d4935375
adding wagon ssh build extention to fix the snapshot repo deployment issue with jaggery build

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132761 a5903396-d722-0410-b921-86c7d4935375
Fixing a typo

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132762 a5903396-d722-0410-b921-86c7d4935375
fixing CARBON-11526

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132763 a5903396-d722-0410-b921-86c7d4935375
fixing issue in redirection logout request sso

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126922 a5903396-d722-0410-b921-86c7d4935375
Corrected README urls

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132896 a5903396-d722-0410-b921-86c7d4935375
Add README documentation


git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132897 a5903396-d722-0410-b921-86c7d4935375
update README


git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132898 a5903396-d722-0410-b921-86c7d4935375
Fixing APISTORE-413

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131102 a5903396-d722-0410-b921-86c7d4935375
implement excelSampleService with file system resources

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@125625 a5903396-d722-0410-b921-86c7d4935375
Added csg agent into ESB.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@125626 a5903396-d722-0410-b921-86c7d4935375
Fixing APISTORE-239

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@125627 a5903396-d722-0410-b921-86c7d4935375
Adding php cartridge init script and updating carbon cartridge init script. Also add mysql and 
php cartridge templates from a patch provided by Lakmal


git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@147906 a5903396-d722-0410-b921-86c7d4935375
increasing the time to 20s in toolbox deployment

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@133920 a5903396-d722-0410-b921-86c7d4935375
initial improvements to deploying toolbox ui

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130315 a5903396-d722-0410-b921-86c7d4935375
Adding missing changes from branch to trunk

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130163 a5903396-d722-0410-b921-86c7d4935375
add : TotalEstimate module
Version bump to 0.3.2
updated : gemspec
Added sub packages to setup script so they install properly.
Turning off compression.
Compress setting manipulation.
Debug=True for heroku.
COMPRESS settings.
configure.ac,php/Makefile.am: Fix "make check" for PHP to work in a
VPATH build using a release tarball.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16623 6b2f1b92-a4f3-0310-943f-de3cbe41748b
api/,include/xapian/query.h: Rework QueryBranch to use a special
QueryVector class rather than std::vector<Xapian::Query>.  The
special class is no bigger than std::vector<Xapian::Query>, and
handles up to two entries by holding them within the object (at
least GCC's std::vector doesn't currently do this space optimisation)
which significantly reduces the memory used by a pairwise operator,
which is very desirable as we no longer flatten a tree of the same
pairwise operator as we build the query.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16624 6b2f1b92-a4f3-0310-943f-de3cbe41748b
lua/generate-lua-exceptions,perl/generate-perl-exceptions,
python/generate-python-exceptions: Have a single copyright statement
at the top of the script (in a $copyright variable), and substitute
this into the generated script.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16635 6b2f1b92-a4f3-0310-943f-de3cbe41748b
Fix uip-split threshold checking
Update README.md
Merge pull request #1 from xuwei-k/patch-1

Update README.md
adding alarm table
basic start
some structure added
EOF whitespace
Merge branch 'master' into develop
add minus and plus 8 hours timestamp method
Added gensyscalls headers for x86_64.
add GMail & Twitter
bug fix.
change folder name from 'con' to 'conn'. In windows, it is not a valid folder name. funny!
change folder name from 'con.js' to 'conn.js'. In windows, it is not a valid folder name. funny!
zigzag merge
correct dependency.
add scope name for all request methods
add scope name for all request methods
compiler 2346 update
multi session test.
schema change
schema update
mutex overlap relax.
mutex.
nosql demo.
Merge pull request #265 from yaz0r/master

More fix to cine
CINE: Fix compile error caused by excess ;
Merge pull request #266 from yaz0r/master

Fix system menu in OS
CINE: Apply some ScummVM formatting conventions
GUI: Fix out-of-bounds in new chooser.
COMMON: Remove fprintf/stderr usage from xmlparser.
Merge pull request #1 from scummvm/master

Merge from main repo
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Wiktip mainwindow
Merge branch 'master' of github.com:yetaai/wiktip
moved Sb* to bin/
new home page with description
Styling the different components
cleaning unecessaries components
modify: comments with commentable
structured page template dir for sub pages & templates
Better support for Collada texture-wrapping on loading.

git-svn-id: https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk@4103 dfc29bdd-3216-0410-991c-e03cc46cb475
Add output to MSVC debug logger

git-svn-id: https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk@4139 dfc29bdd-3216-0410-991c-e03cc46cb475
Apply css in undoing and undone in notification area
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
increase functional test language page wait time to 20 sec
Bug 812730 - TM merge wording change
add icons for key shortcuts and project-wide search
Pre-load identityStore component at @Startup
rhbz881962 prevent glossary search triggering from enter press while in IME input
rhbz881962 prevent TM search triggering from enter press while in IME input
await: fixed project name
change protocol for submodule supertab.
Fix rainbow.pl looping
Revert "Created Licence for lol.c_2"

This reverts commit cdd47463bd25cbb3b6e6cfae8ea1e7bdd911f8bb.
use solarized by default
do not ask for TeX-master, set current file as master per default
todo states simplifications
smaller set of agenda files
The debugger now mostly works
Fixed ignored files
downgrade bem-bl to version 0.2
changed wordnik_api file
maybe
maybe docs
version bump
readme update
Added 'make docs' to Makefile
03-itme: düzenle
fix dependency check
Chuie Experimental, almost complete! :D
Stage 4. Added votes.
Implement NullRequest for Console invocations
tets read
fix conflict
updated sparqlify mapping
added d2r mapping#
Failing at markdown
mp_utils
starting 0.2
prepare for menu, moved the ActionMap

- added MenuItem, Menu and MenuBar
- added MainMenu
- the ActionMap is now a part of Artifex
added dialg ability

- new Dialog class in Artifex
- prepare for about dialog
[Add] BALLOOOOOONS!!!
switched to gles1.1 style rendering
Fixed a bug where stations that do not need preprocessing didn't return stream info.
Added new commands and services to Sayuka. One of them is a psuedo-XDCC server.
All services implement IDisposable for safe cleanup.
Added a ChannelService for handling what channels the client is in.

IRCClient calls Dispose on all services.

IRUserPartQuitEventArgs tells whether its a Quit or a Part now.
Added a few method stubs to ChannelService.
Add getters and setters in ServiceSingleRequis class
Add getters and setters in ComposantSingle class
Add constructors for PortComposantSingle requis and fourni
1 index
index11
Merge https://github.com/AndreyDaf/test
Fixed Actor problem with Request class
librbd: hide ENOENT on discard

AioZero, Truncate, and Remove are only used by discard and resize
operations where ENOENT can be safely ignored.  If that changes in the
future, we'll need to move the enoent flag setting into discard explicitly.

Fixes: #2958
Signed-off-by: Sage Weil <sage@inktank.com>
librbd: add test for discard of nonexistent objects

This verifies librbd properly handles ENOENT during discard.

Signed-off-by: Sage Weil <sage@inktank.com>
Merge remote-tracking branch 'gh/bug-2958'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Imported Translations from Transifex

Change-Id: Ibd2d774602925e5d9863367a42ca79886ea59e2d
Remove db access for block devices on terminate_instance

This makes compute/api pass in an instance's block devices to
compute/manager::terminate_instance() so that it doesn't have
to hit the database itself.

Note that this doesn't remove all database activity in the
terminate_instance() path, just the block-device-related bits.

bp no-db-compute

Change-Id: Ibfb333ef7918e05f0e3634f1fb063f1b02535bff
Remove db access for block devices and network info on reboot

This makes compute/api pass the block device and network info to
compute_manager::reboot_instance() so that it doesn't have to hit
the database itself.

This also extends the reboot tests for the compute manager and
api to validate that these two bits of data are making it all the
way through the stack.

bp no-db-compute

Change-Id: I92346d6c821241885b5f4b08fec05f38e6261edf
Merge "Remove db access for block devices on terminate_instance"
Merge "Remove db access for block devices and network info on reboot"
Avoid error during snapshot of ISO booted instance

Fixes bug #1023492

If you boot an instance from an image with disk_format=iso and then
attempt to snapshot (i.e. nova image-create) you currently get a
traceback because we do:

  qemu-img convert -f qcow2 -O iso -s $snap $disk $out

and 'iso' is not a format that qemu-img knows anything about.

When booting the image, we use qemu-img to detect that the file is
a raw image so we avoid having to special case disk_format=iso
there. However, there's no way of avoiding the special casing when
extracting a snapshot.

Note 1 - it's not very clever to take a snapshot of a read-only
disk downloaded from glance and upload it back to glance again.
Adding such smarts would be a nice enhancement.

Note 2 - only the destination format is important here because
we can only be extracting from a qcow2 image since snapshots
only work where use_cow_images=True. See also #1030844.

Change-Id: I21ff6db8ebb59a83d27f224283fb76f582c38a0e
Use common parse_isotime in GlanceImageService

Rather than reimplement openstack-common's isotime functionality,
just use what's provided for us!

Change-Id: Id44eab3c34ae2c682d27d1563c6baaf68b979d2b
Resize.end now includes the correct instance_type

Fixes bug 1031004. Moves the notification to the destination compute node
so that the correct instance_type attributes are assigned.

Change-Id: I5886154ddd7a9768dc5d82dc4e43e9e0f681ee04
Merge "Avoid error during snapshot of ISO booted instance"
Merge "Resize.end now includes the correct instance_type"
gui stfufyf
Replaced mincbet with mincbeast
Added diffusion tensor case
fixed for tensor images
The foundation of objects is almost done.
correction : problème de date.
 * amélioration : création d'un objet "Alert" plus simple à gérer.
 * correction : erreur lors de l'enregistrement d'une alerte avec données manquantes.
First upload
Merge branch 'master' of github.com:Boreeas/TFMBot
add more extension cruft. make extension checking more uniform.
added tests
Removing some debug stuff and added read/write hooks
Nicer fonts from google
- GlanceServer now removes filter tiles once all submissions have
ticked.
- GlanceServer emits newTile and doneTile signals as needed. Perhaps supersedes tilesUpdated?
- Bug fixes in session tiles.
Merge branch 'master' of github.com:CHI2013/glance
- Fix the order of ports in the OVS bridges. Adding all ports at once was
  causing them to be added in random order. Add one at a time.
Transferring of items and products now works correctly
Fixed test
Merge pull request #64 from CS340Group/beebe

Transferring of items and products now works correctly
Added mixing for transition and animation
Merge branch 'master' of https://github.com/CSSHat/LessHat
major template changes, bootstrap ++