labofsahil/github-event-dataset-2012 huggingface dataset:
splitting recipe up into sub-tasks
Merge pull request #3 from TheSerapher/recipe-breakup

splitting recipe up into sub-tasks
adding some default styles to system messages
adding some generic styles to form submits
Added exam templates
bump TideSDK-Developer revisions
Site updated at 2012-06-22 19:45:45 UTC
Added PixelPerfectTest for collisions
beam screen update
encrypted yaffs2 requires XTS crypto mode

Conflicts:

	arch/arm/configs/cyanogen_mahimahi_defconfig
Merge encrypted yaffs2 support from WhisperYAFFS

This is a port of commit 7b670d7a2df4bf106a4217ef38f1c11db731d11a from
git://github.com/WhisperSystems/WhisperYAFFS to the version of yaffs2 in
cm-kernel.

Conflicts:

	fs/yaffs2/yaffs_mtdif2.c
	fs/yaffs2/yaffs_vfs.c
Updated and clarified comments
- Cleaned up configuration
- Named remote model
Adding logout button
Merge branch 'master' of github.com:Urthen/MaelstromPrototype1
First commit of static module
Ignoring plugins folder
2 mudança
converted stylesheet
finished up refining tests
Added a simple print function that can be called everytime the player moves into a new room.
Trying to fix the errors in the testcases
Finished off the new newGame() function
	 Added its functionality to make directories
	 Copies in the default file
	 Just passes the user to save
	 Should be good to go
Merge branch 'master' of github.com:Will-Beninger/CPSC2720-MUD
Added rucksack BLUEFOR crate script.
xor function configuration file
WS233 models

* This cycle we see a number of model changes proposed by curators:

?Strain

?RNAi

?Life _stage

#Interactor_info

?Interaction

?Transgene

?Rearrangement

?PCR_product

?Anatomy_term

* House keeping changes to:

?Paper

?Process

More infromation and a human readable diff can be found here:
http://wiki.wormbase.org/index.php/WS233_Models.wrm
support ejm layout
Initial project files
test
Site updated at Wed Oct 03 21:55:43 UTC 2012
Use local memory caching to improve performance.
asides, coderwall
new url: dev.adcloud.com
Merge branch 'master' of github.com:adcloud/adcloud.github.com

* 'master' of github.com:adcloud/adcloud.github.com:
  Site updated at 2012-03-29 22:41:45 UTC
  Site updated at 2012-03-29 22:38:46 UTC
  Site updated at 2012-03-29 22:22:23 UTC
  Site updated at 2012-03-29 22:18:14 UTC
  Site updated at 2012-03-29 22:17:38 UTC
Display "Auftrag"/"Fragebogen" in queue
Implemented error catching and display
Proper logger configuration, use new server locations, remove sensitive data
Changing all headings to use (-) markup and not (.)
Merge branch 'jekyll'
initial stab at implicit layouts
fixed partials, they are called includes at jekyll
Merge remote-tracking branch 'docs/master'
Merge pull request #27 from aeronzhou/master

修改概要设计文档
增加Vehicle的时序图
Merge pull request #28 from cyiqing/master

增加载具时序图
Merge branch 'master' of git://github.com/EternalWind/The-Dark-Crystal

Conflicts:
	docs/design/Conception Design Report TMP-CDR.doc
Changing the citation to TV-L1 DAGM 2007
This commit is my first commit of the changes we've made over the last year. Some of the changes are due to how WE use the code in our own project.
I've also removed all the sample code because we don't use. Only the class exists. Some of the changes include:
1) Added WebIS Copyright due to our changes. We're following Matt's original license however.
2) This uses our own Popover manager - you'll have to remove that to make this work. Again, this class was modified heavily to work within our own project. It is only being shared to help others.
3) We slide the master "popover" as in seen in the Mail app on iOS 5.1 and the normal split view on iOS 6
4) We've merged in some changes from other forks as well

Instantiation is done as such (requires Xcode 4.5 and is supported on iOS 6 SDK - requires iOS 5 and above to work)
		window.rootViewController = splitViewController;
		[splitViewController setViewControllers:@[masterController,detailController]];
deleted:    tiff.cpp
Handle gif size
new rake task added to suport travis test integration
Added Moldovian materials

https://bugs.freedesktop.org/show_bug.cgi?id=54137
wold
Replaced magic number constants with margins, moved tileViews from containerView to view
Blog posts page is added
Made mouse movement result in correct angle
Redirect if done
fetching and parsing scorer tips
[doc] add example code
fixed @CompileStatic issue with unknown closure class return type
general cleanup, prepaired to separate utils from lib
merging again
Merge branch 'master' of https://github.com/andrewallen2012/TweetSweep
demo merge
Lots of updates to the model and calculations
Added some better output formatting
Added some more calculations for the fitness
Set up runner to run generations and output results
added contact page
added title helper
finish chapter 5.3.3
Finish chapter 5.3.4
Finish layout and routes
first hibernate app
fixing up the sampling function
Commenting
Pointing API to server
ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips

"atexit" isn't defined in libc.a for x86/mips (unlike their arm's counterpart).
Include atexit.S otherwise app using atexit() may fail to link statically.

Also, add crtbegin.c to brand crtbegin_static/dynamic.c with .note.ABI-tag
section of given API level.  See $NDK/gen-platforms.sh

Change-Id: I2fdbb92119e3ca2da2c1ced6d77e63136ec35c34
Merge "ndk: Add crtbrand.c ; crtbegin_static.S includes "atexit.S" for x86/mips"
Fixed wrong package names in samples hello-jni and two-libs

Fixed package names so tests project underneath can compile

Change-Id: Ia4e58e8caa5db65e05fdb2ec64e52c1564774899
Merge "Fixed wrong package names in samples hello-jni and two-libs"
Fix SEGV when unwinding stack pasts __libc_init

Changed "jump __libc_init" to "call __libc_init" otherwise stack unwinding
past __libc_init may get wrong return address and crash the program or do
wield things.  With "call", return address is pushed on stack and unwinding
stops correctly at _start.  Note that __libc_init never returns, so this
fix wonʼt affect normal program execution.  But just in case it "does"
return, jump to address 0 and halt.

Change-Id: Id194fb32adcbf89ae59939cee33c50b5bbdd36fe
Merge "Fix SEGV when unwinding stack pasts __libc_init"
Merge remote branch 'remotes/aosp/master' into merge_branch

Change-Id: Ief2a40ebdf59c9799c5d76287ed7ab0c7205ecae
package control support
Calibrated Parameters to match Golosov Moments
library -> binary
Site updated at 2012-11-27 01:36:20 UTC
html 5 doctype
Refactor lex urls.py.
more better icons
change options.html to comply with new security rules
manifest v2
Commented out some unworking code, oops
new css-minifier
fixed *.min styles
correciones nombres de atributos
Sekwencyjne rozwiązywanie równań na zwykłych macierzach
updated article content
Moved bootstrapper component out of atlas search so that it can be used by other modules too.
Removed unused class.
Improved ContentBootstrapper and implemented bootstrap change listener for ElasticSearch.
Added pagination to elasticsearch-based topic searcher.
Merge branch 'v4-elasticsearch' into stage
Kamera asset.
Merge branch 'master' of github.com:atomgalaxy/wedding-wedding
cmake: Make sure these deps are in order
Adding a copy of the publisher that crashes consistently
More attempts at getting the simplified app to crash. No luck still.
ruby and open-line improvement
carga de imagen sincrona2
Made the file path for support files more centralized.  Now I can set the tests to point to either the Windows or Linux location for those files without making several changes.
Updating human functionality
Secure Models
Final Version?

tweaked stuff. Tried to setup a install citrix receiver should it be
missing but… can't get it to work.. Good enough for now. Next up,
create postflight and PKG installation.
DisposableHtmlTextWriter now writes end tags when disposed
Changed npm module - saucelabs-qunit to saucelabs
Commit from Travis Build #16
Build - https://travis-ci.org/axemclion/jquery-indexeddb/builds/3405254
Branch : master@ c9f5c55081c57a8bbfd8bfaffd7ccfeeedeafd86
preparations for log-layout
Merge branch 'master' of github.com:backmeup/backmeup-frontend
Merge branch 'master' of github.com:backmeup/backmeup-frontend
added html-titles
basic 404 template
Merge branch 'master' of github.com:backmeup/backmeup-frontend
Add CHANGELOG

Keep the project history available within the repo; make it easier to
track what is currently changed over the last tagged release.
Clean up .gitignore

Remove all the ignores from `.gitignore`. The default boilerplate
doesn't generate any project-specific files that need to be ignored. All
OS and Editor-generated files should be globally ignored rather than
polluting the local project ignores.

Further information on using git ignore's appropriately can be found in
the miscellaneous part of the bundled docs.
make countdown-timer executable
#47 workaround for caliburn binding to windowcommands
dropped extra file
Merge pull request #49 from belfryimages/issue47_windowcommands_not_auto_bound_in_caliburn_micro

#47 windowcommands not auto bound in caliburn micro
cleaned up TOC etc
crap, dropped generated _site folder
added nuget button style via prabit.me
improved getting started
Add disclaimer line.
bis 11.
Shows validation element only when modified.
Adds IDEA specific exclusions + target path  to .gitignore
v0.3 Players are now warned three times before being banned
Generators have been updated so that a basic scaffold should work now (find and update are now [] and set). Creating a model will also create an accompanying migration and the standalone migration is much more flexible.
Added "rails_extensions" plugin which. See comments for details. Updated generators to use new find! method added the possible exception to produce a not found response.
Updated set to update. This error got introduced moving patches around.
Merge branch 'improved-generators' into rails-model-plugin
Add contributors to the README
Bump version to 0.3.3
Merge pull request #4 from binarypaladin/rails-model-plugin

Rails model plugin
Fix typo and update History file
Merge pull request #89 from blackberry/master

Minor fixes for iOS
Merge pull request #90 from blackberry/master

Minor fixes for iOS
Merge pull request #91 from blackberry/master

Minor fixes for Android
Merge pull request #92 from blackberry/master

Fixes for Android
Merge pull request #93 from blackberry/master

rebase
Merge pull request #95 from blackberry/master

Android JNI Errors fix
Merge pull request #96 from blackberry/master

Changed namespace/package to org.gameplay3d
Animation Optimization
Removes numerous calls to dirty() [which in turns calls transformChanged() on itself, and it's children] from Transform::setAnimationPropertyValue() when animating ANIMATE_ROTATE_TRANSLATE or ANIMATE_SCALE_ROTATE_TRANSLATE.
Quaternion friends Transform to give access to static void Quaternion::slerp(float q1x, float q1y, float q1z, float q1w, float q2x, float q2y, float q2z, float q2w, float t, float* dstx, float* dsty, float* dstz, float* dstw). This saves the creation of a Quaternion every time Transform::setAnimationPropertyValue() is called when animating ANIMATE_ROTATE, ANIMATE_ROTATE_TRANSLATE or ANIMATE_SCALE_ROTATE_TRANSLATE.
Removes unnecessary friending of class AnimationController by class AnimationTarget.
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-kcunney
Merge pull request #98 from blackberry/master

Fixes to Android lifecycle.
Merge pull request #383 from blackberry-gaming/next-setaylor

Next setaylor
Merge pull request #99 from blackberry-gaming/next

Next
Merge pull request #100 from blackberry/next

Fixes for Android 3D Audio.
Merge branch 'next' of https://github.com/blackberry-gaming/GamePlay into next-kcunney
Adds the following Public APIs to Transform:
- static void suspendTransformChanged();
- static void resumeTransformChanged();
- static bool isTransformChangedSuspended();
This provides a global mechanism for suspending calls to transformChanged().

Animation Optimization.
Significantly reduces the number of calls to transformChanged() during an AnimationController::update() call.
Calls Transform::suspendTransformChanged() before processing animations. This suspends all calls to transformChanged().
Calls Transform::resumeTransformChanged() after processing animations. This calls all the transformChanged() events after all animations are processed. This reduces the calls to transformChanged() (and on any children) every time there is a change to a Transform's scale, rotation or translation, which would happen quite frequently when animating a character.
Merge pull request #388 from blackberry-gaming/next-kcunney

Animation Optimization - Reduces the number of calls of transformChanged() during processing of animations.
Updates GPB and Visual Studio project files for the template project (used to create new projects).
Fixes automatic game pausing on QNX/BB10 platforms on system events.
Fixes ScreenDisplayer compilation warning.
Updated unclear/incorrect instructions for building for Android in the development guide.
Merge pull request #102 from cculy/master

Minor updates and fixes.
Merge pull request #389 from blackberry/master

Minor bug fix.
Changes gameplay::Package to gameplay::Bundle.
solving 02 with	Interpreter pattern
findById with an invalid ObjectId string now returns null
deploying to my hosting
Site updated at 2012-03-19 02:59:01 UTC
Site updated at 2012-03-19 07:31:17 UTC
Site updated at 2012-11-25 10:35:07 UTC
add scss/compass and associated grunt task
Remove commented out dead initialisation code
No need to track the sockaddr
Add error checking for publishes, acks and rejects
Add AMQP reconnect logic in dequeue for #7

- Upon any sort of AMQP error, simply disconnect and reconnect with a
  one second sleep between attempts.
sgtl5000: microphone gain only has 2-bits of resolution, so max is 3
sgtl5000: set default microphone gain to 2(30dB) to work with commodity PC mics
Made the test suite print a second comparison line
Removed Struts 2 configuration files.
Update Stylesheets and Add BooksController
Update Respond_with on QuotesController
Update master
Merge pull request #1 from Baachi/master

Update composer.
Fix to find existing entities when importing
Beshoy Hanna

* Tested app on Dual-Core and WP8 phones. no problems
* Edited home page and about.
* Ready For Deployment to Windows Store.

TO-DO

jumplist to specific agypeya prayers
scrolling homescreen
dont need to use distribute

* I can just put sqlparse as a install_requires dep
Respect configured template root
Fix Gemfile.lock, Fix Readme, Bump version
fix empty config keys
typo
Merge pull request #2 from vixns/master

typo
exists?(false) returns false

`FinderMethods#exists?` finder method now returns *false* with the *false* argument
Change an order of methods for readbility.
Change the behavior of db:test:clone task when schema_format is sql for consistency.
Change the behavior of db:test:prepare task when schema_format is sql for consistency.
Add a description about ENV["SCOPE"]
Remove session_table_name method because this is global and used only once.
Move to db:structure namespace, because these methods are global.
Merge pull request #6855 from kennyj/refactor_database_tasks

Refactor and improve database tasks.
Add missing require.

If you selectively require core_exts (e.g., require
'active_support/core_ext/string'), it is possible for
'active_support/core_ext/time/calculations' to be required when
`ActiveSupport::TimeWithZone` is not available. If this happens, the next call
to Time.=== will fail with a NameError.
Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require

Missing require breaks Time.=== when selectively loading ActiveSupport core_exts in 3.2.4+
Ensure Arel columns are typecasted properly when grouping with calculation

Fix build issue with postgresql.
Merge pull request #6544 from flexoid/issue-6431

exists?(false) returns false
New Images

- Reducción de tamaño de imágenes para carga más rapida
- Cambio del tamaño de la animación 3D
redimensionando imagem
Removed legacy css file
JSlinted
Remove extra space
pylinted
pylinted
Fix instructions for download of init.gradle via browser
Update to allow use of Gradle 1.0 GA and better
adds belated README
Creating commit to allow pull
Merge branch 'master' of https://github.com/cdncampbell/CB-GraveRobber

Conflicts:
	src/com/github/cdncampbell/GraveRobberEvents.java
	src/com/github/cdncampbell/GraveRobberPlugin.java
Updated with the new 1.3.1 exp modifier.
Site updated at 2012-05-17 11:21:55 UTC
remove username attribution
testdatei.txt
adding in groups; adding in menus
first commit
modified:   _posts/2010/2010-04-30-ipcs-error-in-squid-start.markdown
	modified:   _posts/2010/2010-05-21-intro-strace.markdown
	new file:   _posts/2010/2010-06-26-example-of-chinese-garbled-in-dynamic-page.markdown
实现了摄像头照相的功能，暂时还没找到路径
Adding short readme file
post deseq vs dtw
fix install class.
Merge branch 'master' of github.com:chloeandisabel/puppet-s3fs
- Updated to jclouds 1.5.0-beta.9
poms refactory
Merge branch 'master' of github.com:choreos/choreos_middleware
Fixed modelSpecs in FactoredModel. Moved statesPerDim to environment
Properly namespace classes

Signed-off-by: Chris Keele <dev@chriskeele.com>
Bump version number to 0.6.2

Signed-off-by: Chris Keele <dev@chriskeele.com>
M expr.go
 M meta.go
 M protobuf.go
Changed to old layout
Utilized Tab host and view pager hybrid framework
suprimint els missatges de warning
Update notes for submitted changes

* correct the max_clients calculation
Custom parse marketplace gateway config

 - Avoid token check failure in vcap-services-base

Change-Id: Ie357ec8405d19a4264beb9e90ce4891032b968e9
bump vcap_services_base to 0.1.11

Change-Id: I63166b2a5c5fd9e0d22b153e393dc29faadc28f5
Run #catch_all methods after named events
Site updated at 2012-07-27 10:57:08 UTC
Testing phpmd ignore
defining constante fail
java issues for windows
removed the Home menu item
support (puke)
fix travis-ci config to only watch master
Correcting comment character in hosts
mise en place de has_icon_matcher
Merge branch 'master' of github.com:comptasso/FaitesLesComptes
correction des spec fautives suite à mise à niveau de l appli
mise en place des spec pour bank_extracts
les liens des dropdown menus sont maintenant affichés dans le même couleur, visités ou non
revu les menus bank, cash et books pour que dans la zone public, ce ne soient pas des liens
suppression des routes show pour bank_account dans la zone public
suppression du controller et des vues bank_account de la zone public
suppression du controller et des vues pour cash et book dans la zone public
revu la mise en page des tables lines
revu mise ne page de la table des lines
mis des largeurs à la table organisms dans la zone public
modif des spec requests pour éviter des problèmes avec capybara
Merge branch 'edge'
tentative d arranger spork, rspec capybara,... pour éviter d avoir des faux négatifs et des négatifs aléatoires
revision du paramétrage de spec_helper pour faire fonctionner capybara rspec
index markup and pulls most recent post only
rendering problem troubleshoot
recently section truncates post to excerpt, remove old index markdown file
full for push
Changed tabs to spaces only on parts that needed alignments. Indenting still uses tabs.
more accurate message
Site updated at 2012-11-09 03:43:10 UTC
allow optional connections
Corrections to related products on .crud and .fields. Related products now populates correctly.

Signed-off-by: Jmaiers75 <Jmaiers@jpenterprises.com>
add some new.

Signed-off-by: Daogang Tang <daogangtang@gmail.com>
Adds occupant tracking to rooms to avoid having to pass a reference to the game core around within objects
No search results styled
Touching up functionality
Modified "density" to be broken up into "minimum density" and "maximum density"
Partial working improved version of distribute new cars functionality.
Modified .gitignore to allow nuget.exe
fixing devise method
updated the icn 1.0.3 validation.xsd
DynOpt experiment
fix #56771: admin>users archive option missing after edit
Merge pull request #73 from desunit/master

fixed #72
Merge pull request #74 from desunit/master

Fxing integration tests
Merge pull request #75 from desunit/master

More fixes to resolve integratino test conflicts
Merge pull request #76 from desunit/master

Fixing broken tests, icorrect column names in Alchemy client 
Merge pull request #77 from desunit/master

Final integration test fix: fixed alchemy tests, mq tests
Memory management of large byte [] in buffers
Merge pull request #79 from bculberson/master

memory management of large byte[]
reuse existing connections if they are not in use
Merge pull request #80 from bculberson/master

reusing connections
use new ArraySegment send from windows only
Merge pull request #82 from bculberson/stream-handling

use new ArraySegment send from windows only
Rewrote WriteToSendBuffer() to be more efficient and reslient to large LOH chunks. All byte buffer allocations now using a shared lock-free buffer pool at 1450 byte size chunks (~1500 MTU - frame headers).

All tests pass except for RegressionTests which are either taking too long or hanging - will investigate later.
more efficient find of existing inactive connections instead of using linq and for loop
Merge pull request #83 from bculberson/working

more efficient find of existing inactive connections instead of using li...
related to pull #82:
- fixed issue with incorrect buffer size calculation
- removed ignore attribute from RedisRegressionTestRun
Initial commit which allows you to control a survivor in a map
change to null
Merge branch 'master' of github.com:devst/devst_awaji_elephant
test2
Merge git://github.com/itoclub/devst_awaji_elephant into topic
Fix up all assembly references to monogame.pc project references.
Set project type to MonoGame, to force the monogame.pc unstable library workaround to work (i.e. allow build/run from MonoDevelop to just work)
some changes or something like that
visual fix: line breaks before currency symbol + only show month name in overview
language fixes
Use dropdown instead of textfield. Next up: Possibilty to create new shop
option for new shops
js for new shop
will return as symlink in next commit
symlink
create new shop if asked
strip slashes
Permissions are only needed if installed is true

permissions: This is a comma-separated list of extended permissions.
Your app is granted these permissions for the new test user if installed
is true.
fixing  attr
Added a thought about HTML
Fixing About
Update LinuxZaSve_mobile/assets/style.css

Font paragrafa prebačen u Roboto. Trebalo bi rebuildati APK.
Merge pull request #19 from iwebhub/patch-4

style.css - p{font-family; Roboto}
added  to Observable
версия 0.3.2
Бета стола заказов
update mb to M1 of Dart
jquery test environment
tobi hatn kleinen
Compute Deliverable/ServiceImpl ID
Add support for JAX-RS
Intermediate model refactoring
Add JSON serialization of notifications
Add graph-based mock repository
Fixes for semester.rb.  Please note that the validations have been disabled for now.
I added test to course_spec and made method public in course.rb
Merge branch 'master' of https://github.com/eddieberklee/cs169-group29
austerity
current_game and current_round working now, assign variables gone as well
Adding code examples

Added code examples from step 1-6
removing PARTAKE from links
adding data_capture_conductor
fix crontab bug of Staging
Remove Redundant Code to Change the Color of Checked Boxes
refactored out authentication stuff from app.js. Added support for mongoose-auth. checkin before merging branches.
Javascript example for Navigate
copying method based in social influence
Missing something...
Comments show up now.
Changed the counting of head_comments in itemclass. Each Item does have a list starting with 0 now.Added a comment in app.rb for testing
Merge branch 'production' of https://github.com/ese-unibe-ch/ese2012-team4 into production
registerUser and logs
Validação de estoria

Verifica s eestoria ja possui paginas cadastradas.
Unified model comprising lastFetch and nextPush now the basis for table viewing.

Change behaviour: Full project details in portrait mode as well as
landscape mode.
Placeholders to handle search results.
Abstraction to unify lastFetch and nextPush.  Did a walkthrough at
runtime to verify rationalization function of nextPush.
Update to local data base.  Removed old crud.
fixing address in prod
added missing DROP statements
made the security note slightly clearer
Login master

Login master
added ssh class
edited yaml
updated yaml
added getsite function
Added new sysctl module
change devise i18n
github distrib
Corretti errori cap.1
Added ruby formatting on markdown
Allow "Unwatched" section in TV series to sort to the top if it's used the most.
Fixed bugs where some criteria were not being met.
write the watch list back out
[DEBUG] set dynamic class loading for small file class loading , good for debug
[NEW]  add MyApp.overrides.CustomXmlReader using ExtJS4's way to override
[CHG] GUSXmlTreeStore use customXmlReader for
            reader:{ type: 'customXmlReader'}
ref:
http://frankfenghua.blogspot.ca/2012/05/extjs-debug-dynamic-loading-ext-class.html
internationalized quickmessage view
refactored internationalization annoucement view
Merge branch 'master' of github.com:frontlinesms/frontlinesms2
add reason code for failure
Buml version
Update 0.1a

1) Added Production Rules for 'F' '+' '-'
Modify the png icon as my HG logo.
scaling bg pic
Fixed bug that was preventing matchingValues from working with multiple parameters

There was a bug on line 58 of jamine-signals.js which invoked the
matcher using a single parameter which worked fine for single parameter
signals (e.g. signal.dispatch(1)) but fell over for  multiple parameter
signals (e.g. signal.dispatch(1,2)) - I have used matcher.apply with
the arguments array and added a unit test
updated geocamTiePoint
gitignore: ignore data directory
Added more resolutions to support
Site updated at 2012-04-16 05:13:18 UTC
Playing around with bootstrap's carousel to circle through tweets.
Removed bootstrap from root folder.
grammar was fixed. Key for printing trees was added
Typo in not writable files
при выгребании значения из базы убрал thousands_separator
сменил версию на 3.2.1
Merge branch 'master' of https://github.com/xronos-i-am/mongoid_money_field

Conflicts:
	Gemfile.lock
	VERSION
merge Damain's code, comment, refactor, debug
added boilerplate stuff
merging glek's changes
merged and partial implementation of inventory

There were issues merging.  I hope that I have the lastest version of
each file.

The inventory command is depended on the player.toString.  waiting for
it's implementation.
Clean up of my branch
added verions
Merge branch 'andrew' of https://github.com/glek/yet-another-bard-tale into andrew
Player can now use items in their inventory.
improved parser, new commands, delegates commands

Parser now supports commands with many words as long as the interpreting
logic is in place

Added LOOKAT, INVENTORY, USE, USE ON commands.

Parser integrated with Game Class

Partial implementation of Command delegation.  Added method stubs for
handle/undo command method in Creature and Player.  This is untested.

Old methods from Game that were used to control player are left in a
text file for reference in implementing command handler in creatures.
added potion
Fixed the huge (and very strange...something was messing up diff) merge
conflicts between andrew and I's branches.

Conflicts:
	.gitignore
	AUTHORS
	CONTRIBUTING
	src/Game.java
	src/helpers/StringHelper.java
	src/interfaces/Creature.java
	src/interfaces/GameEntity.java
	src/item/Item.java
	src/player/Player.java
	src/room/GameOver.java
	src/room/Room.java
And fix the slightly less merge conflicts with glek's branch.

Conflicts:
	src/Game.java
	src/command/Command.java
	src/command/CommandWord.java
	src/command/Direction.java
	src/helpers/StringHelper.java
	src/interfaces/Creature.java
	src/item/Potion.java
	src/room/Room.java
Level Editor compatability

Room exit mapping needed to be redone in List format to support adding
empty exits, and modifying them.
Merge branch 'andrew' into melari. Cleans up 0fda266b.

Conflicts:
	src/yetanotherbardtale/entity/room/Room.java
Fix keys not working in rooms with no monsters in them.
Merge branch 'pilona-json-loadsave' into melari
Merge remote-tracking branch 'origin/melari' into pilona-json-loadsave
Merge remote-tracking branch 'origin/melari' into pilona-json-loadsave
Some UML.
Controller documentation.
Don't assume the model has a PK field called 'id' ... it will always have a 'pk' however.
ist2 페이지 삭제
Site updated at 2012-11-21 09:38:07 UTC
Fixed bug where player victory screen was not showing up during victory
Added: Edit car; text box now only shows 1 rlink, not all
doc en: add 2.0.7 release entry
integration with django admin using text input
Added a tutorials admin page
updated Saxpaser, Course and Person
add new query method including logical operation and nested query.
Phase 1 completed! :)
Add log --follow alias to show renames in history
No need to check for arguments when calling other files
More to Spring work, upgraded to Spring 3.1.1.Release
added authentication, ticket, and server message proccessing functionalities
rm index back
found error, setPassword was using insert instead of update, fixed all passing
Merge remote-tracking branch 'origin/candidate-3.8.x' into candidate-3.8.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 3.8.0 Release Candidate 8

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge branch 'candidate-3.8.x' into candidate-3.8.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Community Edition 3.8.0 Gold

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Fix gh-2990 - rowarray removeRows crash

CThorExpandingRowArray::removeRows, was memmoving memory beyond the row ptr
table, causing a segfault if unlucky.
This caused mini sort to fail.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Merge branch 'thorarray-removerows-fix' of https://github.com/jakesmith/HPCC-Platform into jakesmith-thorarray-removerows-fix

Conflicts:
	version.cmake

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
DFU report error if fail to create target directory

If the target directory for a dfu copy couldn't be created this fix
now reports an error.  Previously you got an error from the subsequent
file create which was harder to diagnose.

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Merge pull request #2130 from ghalliday/dfuerror

DFU report error if fail to create target directory

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
HPCC
Created memberlist extension version for Contao 3 in Contao namespace
Update lib/hcommands/hGetThreads.js
building some of the guts
Fix indegree, change name of parameter.
Site updated at 2012-10-11 13:07:54 UTC
fixed cropping
Updated documentation to explain differences between BCC and CC and which are supported in the SMTP and Web APIs
Added hooks for proper CC/BCC handling
added a spot for 'cc' for whenever we implement CC on the Web API
Added CC addresses to the header so they'll be visible to all recipients; added some logic to build a proper recipient list of To/CC/BCC addresses for the actual smtplib.sender() call so this library would actually send to BCC/CC addresses
Updated all PHP script include_once() headers
to include based upon the current file's directory.
This should fix all "file not found" errors for
includes.
Added some startup instructions
renaming of methods as per MM
Update readme, example on .to_xml, refs #13
moved exco views to haml from erb
Create Prume min max
Update mainMenu.js

KI67 module added to the menu
typo fixed
added post title to title element
fixed problem with JTS dependency
Added auto schema creation support for composite keys.
Merge remote-tracking branch 'upstream/development' into development
IDI-33: Fix main nav images to work in IE8
IDI-33: Support for IE 7 & 8; clean up the main nav markup.
Merge remote-tracking branch 'acheetham/IDI-33-ie' into development

* acheetham/IDI-33-ie:
  IDI-33: Support for IE 7 & 8; clean up the main nav markup.
  IDI-33: Fix main nav images to work in IE8
AlarmHandler not setting or AlarmReceiver not getting
sync commit
display of match matrix in collatex lab
opencv dependencies updated
small changes to data list and projects
Branch creation

In the read me file I created intructions in how to make a branch.
Merge branch 'Irving'
conflicts
Update RDF, fixing dump bug.
Add symlink to probe app source file
Remove jake file from source control

Replaced with jake.sample
Change symlink target
Fixed config file path.
Added sample config file.
Added TODO.
Added new scope parameter to LinkedIn for permission requests.
quick fix - aligns on NoteColumn
fix unicode representation of Revolution
players with no units are not 'done' in orders phase
fix: Publish screen
fix: publish
merge: source
added a post-merge hook
Added Examples to the Tools menu
pathChanged: clean up initial bounds check
Temporarily removed the repeat option for adding an event, not sure if we're going to be able to implement that feature.
Add an option to use fixed position.
adding project to repo
Merge branch 'master' of https://github.com/jeremyquinton/vagrant_demo
added initial attempts to handle scale. see #37
framework to do selected panels
panels working pretty well
readme file was wrong. how embarrasing.
don't error out if  isn't in use
read stdin from omega request obj since it cannot be re-read
Added some restrictions

Useres can only view edit-delete-controls if they are the entry owner
or the admin.

The admin can edit or delete all the entries, but if he edits one,
it'll appear a red box below the entry marked as "moderated"
new feature: update ns during creation
changed a lot dont remember
added titles for job search pages, removed refinerycms-i18n translation to speed up page load
Add option to prepare a test build. This is the opposite of the revert option.
Adding releasenotes.
Fixed many speeling errors.
convert to ListActivity
team selection gui (not functional yet and untested due to missing
server implementation)
Site updated at 2012-07-07 03:25:11 UTC
Javadoced Battle Engine
Test Fixes - plugins/kaleo/mysubmissions
LPS-25529
Regenerate
LPS-25531 Check if correct groupId
LPS-25484 User instead of contact
LPS-25516 Incomplete fix from LPS-22593
LPS-25529 Refine the logic
LPS-25529 Regenerate
LPS-25529 Source formatting
LPS-23306

Amazon Rankings now requires AssociateTag
LPS-25534 JspFactoryWrapper should honor the given buffer size when autoflush is off
LPS-25535 Setup wizard conflicts with license manager
LPS-25539 Cancel Ehcache check update timer
LPS-25528 Wrong permission check
LPS-24666 LPS-24668 fixing two bugs in page customizations introduced in LPS-22155. already talked to @natecavanaugh about it
LPS-25418 Better detection of uploaded files, fixes also NPE
LPS-25422
LPS-25545 fixed AtomPub api path
LPS-25408 Reverting the original fix that causes plugins to hang up
LPS-25408 Disable new transaction only for HSQL as a workaround
Out to file
Remove dupe line
Import the class we are using
Create correctly escaped data for jsonpickle
Save the stack on function return
Option to output a backtrace in test cases
kwargs on all output code functions
Formatting of backtrace
Site updated at 2012-04-19 11:14:54 UTC
Started implementation of back button.
Navigation is now functional.
Preparing to add force-directed graph of user nodes.
More work on force-directed graph of user nodes.
Added explode
Validacion del Formulario de Contacto
Merge branch 'development' of github.com:joseignaciosg/PAWRealState into development
fixed wizard form validation receipts
endline chars are now chopped form message strings
Version bump to 0.3.0
released rake
Regenerate gemspec for version 0.3.0
Changed CHANGELOG heading.
Rewrote main module in JavaScript. Added Travis-CI. Added jsonfile dependence.
Add kernel defconfig for screen console or not.
Alfresco and Share port was not set according to the corresponding parameters
add ampache transcoding capabilities
Fix error return code
nvidia-drivers update
added clean flyway task
add heroku.gem
exercises 7.6.1
exercises 7.6.2
exercises 7.6.3
exercises 7.6.4
exercises 7.6.5
Added support for footnotes.

 * Added footnote and footnote reference support.  Outputs footnotes in
   blockquotes with footnote references superscripted.

Fixes #3
Merge pull request #4 from ssmccoy/master

Support for footnotes.
docs: ftp server does no longer support util-linux-ng

A symlink was probably removed from
  ftp://ftp.kernel.org/pub/linux/utils/

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
docs: update TODO

Remove tasks that are done.

dmesg: --follow option
Reference: 0fd12a9697c2e01e3c2e1e558ff027cd2947ee94

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
libuuid: use run configured state directory

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
agetty: use configured run state directory

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
uuidd: use configured run state directory in manual etc

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
libuuid: make pseudo random file save path configurable

Former path '/var/lib/libuuid/clock.txt' was likely missing in many
distributions, as there where little hint such should be present.  This
patch will move the clock.txt to /run/uuidd/ directory.  While it might
not be perfect location it at least is expected to work.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Modified for task5
[api] Cleanup in User.states

- default_states were unused (replaced by states)
- default_states were conflicting with states (5, 6)
Create migrations for attribute sets. Update Builder and AssociationBuilder
Add base attribute methods
Update #attributes and #attributes_before_type_cast methods
Refactor read attribute methods and update features
Add create features
Overwrite respond_to? method for generation hydra methods
Implement default value for hydra attribute
Add unique index for value table
Allow to create new hydra attributes in runtime
During attribute deleting delete its dependent values
Fix where conditions for new EAV structure
Fix order features
Add reverse order scenario
Fix group features
Keep hydra attributes as models instead hashes to have more flexibility
Implement select query method
Remove hydra_set model and all associations on it
Remove hydra_sets from test schema
Move install generator to rails folder
Remove dead test code
Site updated at 2012-08-16 01:39:14 UTC
Sprawdzanie w bazie czy mail istnieje
Wyświetlanie komunikatu
Inserted an index.html file
update sortable doc, based on note on the blog
This will force the image_uploader to overwrite the existing filename so that edited offers will be written to the same filename as the original offer picture. Works great for emails because they never cache the images. But for the browser it's not yet working effectively because the browser caches the previous fetch of the offer picture from that URL and doesn't bother to fetch it again. Not sure how to fix that yet. So consider this a work in progress.

Or a blind alley that will need to be reverted tomorrow.
Made it multithreaded, and added signal handlers to get information
ICFP: Updated bib entries.
Final ICFP paper edits.
Adding checking for redundant dependency versions.
Trying yet another version of release plugin
[maven-release-plugin] prepare release lint-maven-plugin-0.0.5
stupid git config
Send browser refresh command on file change
Version bump to 0.2.1
- window header name change form ' annotatie' to 'analyse interpretatie'  (pp ??)
Merge branch 'master' of github.com:lizardsystem/lizard-portal
extra classes and adjustments for history view of lizard-esf and lizard-waterbalance
ESF area overview
Added the validation of the mapping in the profiler panel
Improved the toolbar display
Added return codes for doctrine:database:[create|drop] commands
Merge pull request #118 from hason/return_codes

Added return codes for doctrine:database:[create|drop] commands
Update Resources/config/schema/doctrine-1.0.xsd

Missing config
English mistake "an entity" not "a entity"
English mistake "an entity" not "a entity"
English mistake "an entity" not "a entity"
Merge pull request #120 from tristanbes/patch-2

English mistake "an entity" not "a entity"
Merge pull request #119 from tristanbes/patch-1

English mistake "an entity" not "a entity"
Merge pull request #121 from tristanbes/patch-3

English mistake "an entity" not "a entity"
removed composer download
Merge pull request #122 from bamarni/patch-4

removed composer download
allowed symfony 2.2-dev
Merge pull request #123 from bamarni/patch-5

allowed symfony 2.2-dev
Fixed some CS
Moved the caching of the calculated value to the collector

Caching the value because of the calculation should not be the
responsibility of the template.
Merge pull request #112 from stof/validation_mapping

Added the validation of the mapping in the profiler panel
Added an item in the toolbar when the mapping is invalid
updated a parameter in the proxy autoloader
修正部隊不懂過河的bug
Commit inicial com a estrutura do blog.
rabbitmq-server: Version bumped to 3.0.0
gst-plugins-good, nut: removed hal
dovecot: version bumped to 2.1.12.
us -> use

reported in #62
Reset project directory & fixed some text things in scene
Added an example of class use
Bugfix: Cached binaries must include compile options as selection criteria.
Merge branch 'unstable-jumbo' into bleeding-jumbo

* unstable-jumbo:
  Bugfix: Cached binaries must include compile options as selection criteria.
update portfolio content
test include
line style !?
drastically reduce memory footprint.. store a map of
'all timestamps a cron will run at', keyed off the time portion of a cron (which will have many duplicates).
added detail view for blog entry
Se agregó el título de la obra en <titleStmt>, no se extraía de <p rend="Title">
Added handling game objectives and timing the level

Fixtures still need some work though as they have an ugly offset
Add abort for converting
swatchmaker build
Dicking w/ Distar
Agregada la plataforma express
[OBRD] correzione slider
show using link in locations list
Added a batch remove.
python-scard.py
Did a lot of the work to make it work with dictConfig
more documentation for union and compress uses an inner function of one fewer argument
cleanup
removed debug
removed unneded atmel data
BT headset fixes and hacks
debug init.sh analyze.sh
Changed PING odd/even ID rationale
Merge pull request #16 from jtjacques/gh-pages

Change PING odd/even ID rationale
Allow ddclient to be disabled
added verbose logging functionality for basic progress logging
Minor Fixes to HTML structure and Automated Queue Code
Moved the end script tag contents to the end of the larger script tag
Removed City Tasks as distinct from the Queue
Changed HTML accordingly
Removed references to queue[0] and queue[1] which neglect to check if the array has 2 or more items
That Explains the script tag at the end
Turned it into a onload function for the body tag instead
Merge pull request #7 from uiri/queuearray

Minor Fixes to HTML structure and Automated Queue Code
Fixed READOME + Cleanup
Work on documentation
Fixed bug where roster handlers wouldn't be called after the connection disconnects and reconnects.
Merge pull request #77 from hperrin/patch-3

Fixed bug where roster handlers wouldn't be called after the connection ...
Fixed small bug where neighborhood data was being populated in user object with certain database calls
removed MIT lic until further research
fixed npe
some percent enconding checks
drift tracker getting ready
updated moment module
added travis config
fixed mocha path in npm test
fixed moment test, updated readme about parsing dates
added travisci build image to readme
removing apriori
Fixed an issue with mysql-server-5.5 not starting due to invalid default valid for "innodb_flush_method".
Fixing up if statement.
cookingDate to recipe added

adding a variable shouldn't affect existing database
Diff and check lines
Configured the Connections in Web.Release.config
Merge branch 'master' of https://github.com/mmsommer/Ogd.PackageServer

Conflicts:
	Source/Ogd.PackageServer/Ogd.PackageServer.sln
Fixed GPIO mode for SSD1963
some pep8isms, r=rhelmer
Added Arc class
Created a succesful demo of a circle partioned in fragments contained elements layout on various iso lines
Merge pull request #2 from myhere/dev

merge branch dev to master
Revert "update test"

This reverts commit 976ab2207d218b56f6b02109f2b43db68f44fa0c.
Merge branch 'master' of github.com:myhere/vim-nodejs-complete into dev
Fix path for autoloading bundle
Removed "Category:" prefix.
fix marginalia version
Implements RecordGesture and displays gestures in Kinect Plot from session CSV
Adding previous work in C++, java, perl, and python. Changing directory stucture.
alpha 2 -- added chipmunk
created a basic working model
Created README.md
Updated README.md
Updated README.md
modified code to work with latest libvarnam
Merge branch 'master' of https://github.com/jijeshmohan/varnam-addon
modified binding file to take the lib from system path
appliyed patch
Added a sample transliterate server
Simplified code. Added transliteration and reverse transliteration.
Wrapping inside classes.
Removing node.patch file
modified server.js with varnam class
changed transliterate to return all suggestions
Adding learn()

Usage:

node learn.js മലയാളം
Require changes for osx
Returning JSON results
Removing test data
Throwing proper exception when init fails
Removing unnecessary files
Added GDPRate field
Intercepting at PlainSocketImpl
improved the way sockets are intercepted
eagerly retransform the PlainSocketImpl in case it's already loaded
need to flush the stream
testing the server socket capture
improved diagnostics to report where it's connected to
shutdown the test cleanly
load into self
now accessible as HTTP server
documenting HTTP server capability
[maven-release-plugin] prepare release file-leak-detector-1.4
[maven-release-plugin] prepare for next development iteration
reuse javamelody virtualmachine to avoid conflict loading native library
Rework the build target into a Framework.
change dummy url to checkout/cart from base url
use vec in q15
Mon 26 Mar 2012 11:12:23 PDT
some more media syncing methods
enable auto-play sounds
Merge branch 'master' of https://github.com/iniju/Anki-Android
latex support working
Merge branch 'master' of https://github.com/iniju/Anki-Android
re-structured algorithms folder
re-structured algorithms folder
Site updated at 2012-04-21 00:39:41 +0800
Cosmetic changes: border for hovered cell, faux cell border (white).
added the files you mailed me on gmail
doc
Merge branch 'master' of https://github.com/nmaisonneuve/mechanicalmap
added some configs from http://nuclearsquid.com/writings/git-tricks-tips-workflows/
updated aliases to remove dupes & bugs
further JS fixes for scorecards
added scoreboard for fraternity totals
Link 'now playing' song titles to the sound on soundcloud, and link main title to homepage
Update Readme.markdown
Merge pull request #40 from joffreylacour/patch-1

Update Readme.markdown
Updated with the refactoring of NSDate_NTSExtensions -> NSDate+NTSAdditions
Site updated at 2012-05-03 03:23:36 UTC
restassurred: streamlining the api again (still not working too ugh!), need to write unit tests!
changed street structure, added traffic lights, modified colormap
Label functionality
remove jquery and modernizr
close quietly InputStream
Created a Space Invaders clone, based on Pi Shooter
Workflow server for py4j
Merge branch 'master' of github.com:DawnScience/dawn-workflow into py4j
Added eclipse variables to parameter value substitution.
migrated to use ParameterUtils.
py4j: improvements of the gateway server
py4j: added setters for parameters in the server, added py4j0.7.jar
py4j: Improvements of the Java py4j gateway server
Merge branch 'master' into py4j
Attempted fix to Olofs concurrency problem.
Import clean up
py4j: Working test suite, message actor not working
Attempted to make import source import data which is a single image only
always with the name "image".
Spot the deliberate error.
Merge branch 'master' into py4j
py4j: Started to add more callbacks
issue28: Fix for null pointer exception when run in a py4j server
Merge branch 'issue28' into py4j
Merge pull request #1 from olofsvensson/issue28

I checked this Olof and it looks ok as far as I can tell and if you have tested it then it certainly should be safe.
py4j: Implemented createUserInput callback
Added actorName to UserInputBean, check for null actor in ParameterUtils
Site updated at 2012-11-29 13:18:54 UTC
fix ${S} being ignored