labofsahil/github-event-dataset-2012 huggingface dataset:
Build helper: ignore local live-build tree
fixes for newer live-build
enable afpfs-ng
把vimrc文件放在.vim文件夹里面
Wall post styling added
autopep on nxted
+ added different examples of Pandora
+ Please keep in mind that they are not updated to the last version of the code
update sizzle to 34
jsdoc
PLS plot update
game_engine. Fix to ludus game interface.

Add inline empty implementation of constructor and destructor.
game_engine. Implement the creation of the test game.

Add test game class.
Create a test game and return it in the call to create the game.
The test game does nothing for now.
game_engine. Add build dir to gitignore
game_engine. Update data model design.

Add class diagram.
Add components description - replaces sub objects.
Add functionalities description.
Add a section for test autodiscovery
Fix an extra close angle bracket
support xclass
быдлокод. работает. вроде бы.
Быдлокод добавляющий конфочкам собственные настройки
Переделано.
вротарт фиксед
Modified git ignore settings, cleanup, and IDEA shenanigans
Added a getProviders method for tests
Fixed CalendRServiceProvider
Updated modules for Travis (fail in SSH - publickey)
deleted clerk
added a perl script to generate a hash containing some meta information about each episode
added interlocutor-hitlist and more_than_one_interlocutor
added duration-hitlist
Update yahoo/finance/yahoo.finance.quoteslist.xml
Ignoring ncrunch project and solution files
Merge pull request #2 from lawilliams/master

Ignoring ncrunch solution and project files
Merge branch 'master' of github.com:EventStore/EventStore
reload dict, load nothing if disabled
[lua] NULL string is already handled in the function.
More integration tests, need to be better parametrized
Added permission settings in admin interface
demo: Show registered email address in account settings
Add a link to create new samples
add some specific ghost logic
fix pinky target position
change status handling in progress, check to fix
adding home-office interview
glol - oneline git log
check in an example usage for continuous event callback with kevent
Pending package filter.
Show progress dots..
Update README.
tabbar select font color
with bug...
work?
revert me?
adding crapppage
cluster fuck
test magit
testtesttest
deals branch
Added migration (price + feature) for deals, implemented restful actions for deals controller
Merge branch 'deals' into development
Add breadth-first search simulation
Dim toolbox when tools not enabled
Revert "frist Gui's"

This reverts commit 016a7a718b3b23c47856494526b6d9a201d628c9.
Revert "Revert "frist Gui's""

This reverts commit e5f41d8eac67ee12dd6acf7f7d9f88cee9c26cdb.
ville: add missing proprietary camera lib

Change-Id: I875370f0d6d313e47f77587104477fb843588d69
complete synchro
Added php file to deal with Heroku
Fixed units on japex memory tests.
updates
basic hdf working
Apply slygamer's fix for external reference asset paths
Merge to revert attempt to fix that failed on iOS
Added new config option "GM.Command.Start". This allows you to change how a gm command starts. You can define more than one symbol or letter.
For example: GM.Command.Start   = "! ."
would use ! and . as gm command start.
You can define more sperated by a space " ".
missed a change in last commit
Checks rank on world change
1.7 now with DataStorage herp derp
[Arthur] Criação da classe ProcessoAbrigadaController
Adding a simple sanity check for the config file. Will need to make it a bit more elaborate though :)
Adding a cloned script that'll set the page background to white, if transparent.
Adding all complete files
Move post action button to CSS.
Dark post action button in dark theme.
Don't jump around so much showing read posts.

The goal when showing read posts is not to scroll anywhere. That's not
possible when there's less than a screenful of unread posts, as they'll go
to the bottom after loading read posts (pushing us over a screenful).
Moreover it's easy to accidentally trigger a pull to refresh. Now we just
scroll to the bottom if staying where we are isn't possible.
Auto-refresh when app becomes active.
Grab AFNetworking 1.0.1.
Fix AwfulActionSheet when created with -init.

We weren't setting the delegate, so the blocks never got called.
Do our own image preview.

Wanted to change a few things here anyway, and MWPhotoBrowser did much more
than we ever needed.
Can preview any image, including quoted ones.

Originally we'd tried to disallow previewing emoticons, largely because
the preview isn't animated, but that inadvertently prevented previewing
quoted images too.
Amélioration de la consommation mémoire du code javascript et ajout d'un htaccess pour la gestion du cache et de la compression des fichiers
Minification des fichiers js et css
working find_first, infect_file, find_next and loop. But now crashes in
adding a section
Fix copyright notice, make compilation easier (at least on OS X).
COMP: Propgate compiler settings

When choosing a compiler option at the top
level of Slicer CMake build system, one needs
to explicity propogate that compiler and it's
settings to all sub-projects to ensure that
the requested compiler is used throughout.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@19923 3bd1e089-480b-0410-8dfb-8563597acbee
added simple code to draw the random chunk

also tweaked the chunk generation parameters to be more compact
05.10 13.10
19.09 17.20
Updated program to use all users instead of only thread starters
more color configuration
Merge pull request #10 from timothyclemans/master

more color configuration
se remueve chatarra
Home.View: Se cambia MARK por italic y bold.
Added flicker effect , changed Functions to Events, better Explosion added
Update paramiko/file.py

Added a closed property as an alternative accessor to BufferedFile's _closed property.
Just committing some progess; not even working.
Added new files; still nothing to permanent nor working here.
Removed .swp files.  D'oh.
Grasped the plugin loading dynamic, some other stuff.
- fix small samples/taskmanager bug
Test-Level gelöscht
Bild für Dummy-Tiles wird nun über eine Methode der Klasse Tile gesetzt
(vorbereitend für Plättchen-Beweg-Funktion)
Unsere Plättchen sind nicht drehbar, daher überflüssigen Code entfernt
Beim Verschieben "leerer" Plättchen muss das Bild jeweils korrekt
gesetzt werden.
Außerdem Methodenkommentar korrigiert
setState*()-Methoden durch setState + enum ersetzt
Zur Besseren Unterscheidung Plättchen rot statt grün färben, wenn ein
Tipp gegeben wird
Erweiterung der Klasse Raster
 * Variable rows in rowCount umbenannt um Konflikte zu vermeiden
 * Bugfix: addTile() und removeTile() ändern nun auch die tatsächliche
Darstellung (bisher wurde nur das felder-Array angepasst
 * Hilfsfunktion um die Position eines bestimmten Plättchens im Raster
zu ermitteln
Bugfix: Methode setImage() ruft sich immer wieder selbst auf...
Erweiterungen der Klasse Spiel
 * Fehlende Kommentare hinzugefügt
 * OnClickListener für "leere" Plättchen hinzugefügt
 * Mechanismus zum Vertauschen von Plättchen hinzugefügt (#12)
Continued continuous integration / deployment testing.
#10: Design for Nutrients and ingredients main view.

Time: 4h
Description: Created the main views mockups for Ingredient and nutrients, including CRUD functionality.
Updated Drupal core and contrib
Merge pull request #26 from shrop/master

Update Drupal core and contrib
Added spec for Vkontakte-iOS-SDK
https://github.com/StonerHawk/Vkontakte-iOS-SDK
Syntax error fix
Fixed repo url
preserve_paths
Added dependency to MBProgressHUD
Added  s.platform = :ios, '5.0' and s.requires_arc = true
Merge pull request #292 from StonerHawk/master

Vkontakte-iOS-SDK pod spec
[Fix] GMGridView
Update UrbanAirship-iOS-SDK / 1.3.1 to 1.3.3

Update UrbanAirship-iOS-SDK / 1.3.1 to latest UrbanAirship-iOS-SDK / 1.3.3 
Also added google-toolbox-for-mac to the exclude list. 
Merge pull request #527 from robertmurray/patch-1

Update UrbanAirship-iOS-SDK / 1.3.1 to 1.3.3
update as Asana17/12
servo is not moving left right at target degree
Updated information syncing between add bowler screens and the score grid
Raster have Axis now
Merge pull request #149 from D4nte/master

fix when tokens file does not exist
Merge pull request #150 from D4nte/master

unit test for the previous push
Changed style for Accounts and Settings pages
Set theme for account, login, register
Merge branch 'master' of github.com:thibaud-rohmer/PhotoShow
Merge branch 'osi'
Modem13.
Merge branch 'master' of https://github.com/DHXD/DataLogger
Thêm thư mục bin.
merge conflicts
merge conflicts
merge conflicts
merge conflicts
merge conflicts
mereg conflicts
tests OK, saving
Added release notes
Added getAllGroups function + fix on an error message
Merge pull request #1045 from acasajus/fix-things

Added getAllGroups function + fix on an error message
Let's see if this is any better ...
new coff
New README text

We have tests now and it is actually tested enough that I it is stable
enough to be used if you just want to experiment with it.
fix: api makefile for the new nacl sdk
Added flash hash to a few routes
lotoplus json update at Jul 31, 2012 7:30:02 PM
list of files updated for 20120527 at May 27, 2012 8:30:20 PM
use "IPv6" and "IPv4" in strings as these are the official spellings and
reflect this change in ParseNetwork()
Merge pull request #934 from luke-jr/gitian_luke

Add Luke-Jr's PGP key to gitian-downloader
VC2010 compile fixes
Merge pull request #949 from laanwj/2012_03_vc2010compilefixes

VC2010 compile fixes
move QT_PLUGINS stuff to qt main file, where it belongs
Code deduplication: make function in GUIUtil to get connection type to call object slot in GUI thread
with invokeMethod.
Update UI through async calls MainFrameRepaint and AddressBookRepaint instead of a timer.

- Overall, this is better design
- This fixes problems with the address book UI not updating when the address book is changed through RPC
- Move Statusbar change detection responsibility to ClientModel
remove unused CalledSetStatusBar and UIThreadCall notifications
remove dependency on serialize.h and util.h for SecureString
move translation function _ to qtui.h/noui.h instead of util.h
support RPC stop and encryptwallet with UI
qtui.h/noui.h interface cleanup

- rename wxMessageBox, remove redundant arguments to noui/qtui calls
- also, add flag to force blocking, modal dialog box for disk space warning etc
- clarify function naming
- no more special MessageBox needed from AppInit2, as window object is created before calling AppInit2
Use a messagebox to display the error when -server is provided without providing a rpc password
Move from noui.h / ui.h to one ui_interface.h with dummy implementation for the daemon.
Merge pull request #1025 from Diapolo/GUI-BlockDL

modified block DL progressbar to be more informative and precise
Merge pull request #1019 from laanwj/2012_03_uirefactor

Streamline UI ↔ Core interface
Locking system overhaul, add condition variables

This commit simplifies the locking system: CCriticalSection becomes a
simple typedef for boost::interprocess::interprocess_recursive_mutex,
and CCriticalBlock and CTryCriticalBlock are replaced by a templated
CMutexLock, which wraps boost::interprocess::scoped_lock.

By making the lock type a template parameter, some critical sections
can now be changed to non-recursive locks, which support waiting via
condition variables. These are implemented in CWaitableCriticalSection
and WAITABLE_CRITICAL_BLOCK.

CWaitableCriticalSection is a wrapper for a different Boost mutex,
which supports waiting/notification via condition variables. This
should enable us to remove much of the used polling code. Important
is that this mutex is not recursive, so functions that perform the
locking must not call eachother.

Because boost::interprocess::scoped_lock does not support assigning
and copying, I had to revert to the older CRITICAL_BLOCK macros that
use a nested for loop instead of a simple if.
Condition variable for outbound connection slots

Keep a global counter for nOutbound, protected with its own waitable
critical section, and wait when all outbound slots are filled, rather
than polling.

This removes the (on average) 1 second delay between a lost connection
and a new connection attempt, and may speed up shutdowns.
Add ifdef RELEASE to makefile.osx as the compile-for-older-macs flags
Remove half-implemented publish/subscribe system
Enable addmultisigaddress RPC call for main network
аватар 64
Merge branch 'master' of https://github.com/Digt/TrustedNet
added next/previous patterns
Added course button and fixtures
Merge branch 'master' of https://github.com/EJIqpEP/courses
Major restructuring of files and converted input window to a plugin
Removed input-window construction in em.js
Fixed missing js files in rb script
Made project-listings into a plugin
Added updateAllCollections to project listing plugin
Made project list instances public
Check for project list results inside result-lim element
Fixed missing me
Initialise project list. Also removed debug output from pooltable models
Project listing css
Project listing font size reduced
Added plugin views
Fixed syntax error
Support naming of dialog instances
Basic menu bar items
Append menu items to menu
Make menu items into jquery menus
Missing bracket
Hide menu on blur
Try again with hide on blur
update canmonitor
Ignore dist
Added some more graphics; wav version of menu
Usando novo sistema de Espaçamento do Chat
Fix create symlink: mkdir the parents directories, #10
Created password change pages
Création de la macro donnee qui permet de serializer proprement un type
en lui donnant une fonction de serialization.
Merge branch 'master' of https://github.com/Ephasme/TP1_SDD.git
CSS de mas articulo e inicio de mas eventos

Se crearon los primeros archivos de más eventos, la vista de más
archivos, css de la vista mas articulo, inicio de la nueva función de
guardar eventos...
Implemented jQuery & Styled Login Form from browser top rolling-in
segundo teste- alteração
segundo teste alteração
added log macros
Fix cartelle e file
sacrifice SupressWarning for the sake of compilation
trying installing composer for travis-ci
libfreerdp-sspi: NTLM server-side pubKeyAuth sending
server: fix audio input buffer issue.
Added a code sample
add change column function and delete function +
the message belongs to their columns +
the configuration belongs to their columns
Delete on Sync would just loop to no end because Request already comes with delete method.
Fix Quest 111.

Removed incorrect RequestItemsText.
Minor CSS style change for -Moz for JSON samples
a;j
Cosmetic: move include to source file. It's not used in the header file.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22210 57a11ea4-9604-0410-9ed3-97b8803252fd
Initial commit
o primeiro commit teste
novos ficheiros
Merge branch 'master' of https://github.com/GraveStone/teste

nova tentativa
outra vez
Removed debug code which was left below.
reconnect sics terminal
Redocument the code
Give vundle installion instruction
make plugin respect DisplayEntities setting
ensure connection reuse
Added a main class
Updated .gitignore to ignore /bin
task prepending for queue
Dependencies with bundler
Merge pull request #6 from IATM/bundler

Dependencies with bundler
Added dashboard view related changes
chunk commit: built gui and tweaks
added tweets model
thrashing the twitter
Twitter connected
Begin work on line and DRA chart docs
luaL_register const correctness
Merge pull request #51 from belm0/const_fix

luaL_register const correctness
cp First.html to index.html
添加locale的get方法
Merge branch 'master' of github.com:JeCat/framework
add daemonize() function usage example
Added content_types method that gets an array of content types for a file
Fixed deprecation warning for rails 3.2
Rails 3.2 and Devise 2.0 compatibility
Added documentation for .vimrc and key mapping.
Merge pull request #89 from tomlu/keymap-docs

Added documentation for .vimrc and key mapping.
rename Float -> FloatingPoint
fix #1514
gemrc
gdefault / persist undo
path fix
fixed project overview
added sql database structure
now supports randomly selecting a poolId from
OrganizationAPI.pools().

Warning message added to let user know that with -r
the run time will increase.
Fixed some print statements and sys.stderr.write() statements.
Simple, remove a period from -r help option.
fixed a small typo.
Merge branch 'master' of git://github.com/Katello/katello into populate-systems-random
Merge pull request #454 from eanxgeek/populate-systems-random

Populate systems random
content-deletion - add backend support for deleting errata

This commit contains changes needed to process deletion
of errata that are in a deletion changeset.
content-deletion - add backend support for deleting distributions

This commit contains changes needed to process deletion
of distros that are in a deletion changeset.
Merge pull request #386 from bbuckingham/fork-content-deletion

content-deletion - add backend support for ...
814118 - fixing issue where updating gpg key did not refresh cp content
fixing code style
product model - returned last_sync and sync_state fields back to json export
They were removed with headpin merge but cli uses them.
Merge pull request #106 from tstrachota/product_sync_status

product model - returned last_sync and sync_state fields back to json export
821010 - catch and log errors fetching release versions from cdn
Merge pull request #104 from jlsherrill/bz814118

814118 - fixing issue where updating gpg key did not refresh cp content
Merge pull request #108 from thomasmckay/821010-cdn-fail

821010 - catch and log errors fetching release versions from cdn
system errata - mv js to load on index

This change is to load the system_errata.js when loading the
system's page.  This behavior is consistent w/ how js is loaded for
many of the panes.  In addition, it addresses a JS error that
currently exists when attempting to access the Errata pane.
Merge pull request #112 from bbuckingham/fork-fix_system_errata

system errata - mv js to load on index
Merge branch 'master' into system-groups

Conflicts:
	src/config/assets.yml
system groups - add system count to Details page

Update UI so that the Details pane of the System Groups UI includes
a count for the number of systems in the group.  If user clicks
the count, they will be sent to the System's pane which lists those
systems.
system groups - api - include total system count in system group info

When a user invokes 'system_group info' on a group, include in the
response the number of systems currently assigned to it.
rename navigation_element as panel_link, use it for link on group pane

This commit is based on an excellent suggestion by jsherrill to leverage
the navigation_element in the panel.js to handle the new link
added to the System Groups -> Details pane.

The navigation_element was originally added when we needed to support
3rd level navs within a panel (e.g. to avoid the normal redirect
that occurs when a user clicks a link in the 1st or 2nd level
nav); however, it is actually something that can be used by any
link on a pane where do not want to leave the page and basically
want to go to another pane.  As a result, renaming it to
panel_link.
Merge pull request #204 from bbuckingham/fork-group_count

system groups - include system count in UI Details and CLI Info
disable using X-Sendfile for sending files

Apache is not configured to handle this for now. Therefore using X-Sendfile
header doesn't work anyway and causes problems when sending static files.
Use newer restapi gem
Rename "addins" components directory to "addons".
Backend Bugfix for filtercreation.
print output arrays
Use the new helm git submodule instead of the anything file
the makefile finder now search for ./build kind of directory because it is common for cmake to put makefile there
Addition of git alog
Addition of bindings for git svn commands
Trac wiki now uses mediawiki bindings to promote and demote headings
Mark the holidays in the calendar
Add -Defines for ANDROID and ARM
Update 'native' submodule
Cosmetics
add built by me package path to env
Update 3/0000/0171.txt
Update 3/0000/0171.txt
Merge pull request #675 from bounky37/patch-17

Update 3/0000/0171.txt
Update 3/0000/0030.txt
Merge pull request #264 from mmchross/patch-44

Update 3/0000/0030.txt
Рисовалка допилена

мент
Структура перепилена
Changed style of last edited feed
Merge branch 'master' of https://github.com/Landric/PANFeed
Getting base players
Fix for me
Implement DankCellarBot
package algorithms

Change the package name
Fix path to crashlytics framework.

[ADDED]     Missing scripts for Gorillas Lite target.
[FIXED]     Updated Crashlytics script for new framework location.
Moved ToLower to system.c
Updated Facebook images
correct name in db load command
fixed spelling in info
Warned user that files in their inbox can be removed after 72 hours.
Warned user that uploaded files may be removed after 72 hours.
Merge pull request #141 from teharrison/develop

typo fixes
Merge pull request #142 from jaredbischof/develop

Develop
Merge pull request #143 from MG-RAST/develop

more release 3.2.5
Added code to properly logout.  Including deleting cookies and displaying MetaZen logout page.
final commit. 01.11.2012
TP04: matlab working from java

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@46 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
README with TP04 info

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@47 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Crossover

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@48 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Finish algorithm

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@49 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Add backpropagation function

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@50 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Merge branch 'master' of github.com:Macarse/sia2012

Conflicts:
	TP04/java/src/com/g4/java/FunctionResolver.java

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@51 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
New ANN version

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@52 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
GeneCrossOver

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@53 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Merge remote-tracking branch 'origin/master'

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@54 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Merge remote-tracking branch 'origin/master'

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@55 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Java modifications for matlab

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@56 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
MultipleCrossover

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@57 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Ending Functions

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@58 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Tournament Selection

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@59 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Rulette Selection

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@60 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Rulette modified

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@61 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
ParameterizedUniformCrossOver

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@62 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Merge remote-tracking branch 'origin/master'

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@63 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Mix Selection

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@64 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Configuration

git-svn-id: https://repo.it.itba.edu.ar/svn/sia-2012-4@65 39a6b423-ae9d-42ef-8f9a-67f0a12ae516
Improved Facebook implementation
Removed some oddities with the Kinect Guide gesture
added Latvia to foreca.com database
Octopress init
Site updated at 2012-04-11 18:05:53 UTC
Load and Templates classes fixed
Implemented the issue #4-structure almost completely, however the host lookup won't work. Still a lot of work to do ;)
correction of last commit
class ファイルを JAVA6 準拠にした。コンパイラー警告が出ないようにした。
Merge branch 'on_favorited_time' of github.com:Mocel/twitter4j into on_favorited_time
Update Image Service Authentication Options

Signed-off-by: Nelvin Driz <nelvindriz@live.com>
Better default colors, clear display after buffer flip
Initial support for bullet physics
auth and jade templ
Fixed ArgvInputTest
Merge Registers structures into their respective CPUs to avoid additional memory addresses being loaded every opcode.
Add the update methods for the upper and lower screen into defines.
Speed up rendering by an unknown amount.

gfx.cpp, others: Avoid always checking for Settings.SixteenBit if FOREVER_16_BIT is defined.

port.h: Define FOREVER_16_BIT below PIXEL_FORMAT.
bring back test/commands/UserReporters.txt

not problematic anymore after prim.gui elimination
sbt: aggregating the run-main task across subprojects doesn't make sense
convert some misc prims to Scala
split tokens3d.txt off from tokens.txt

it's more modular and helps avoid merge conflicts
whoops exclude HubNet and SDM tests on core branch
Merge remote-tracking branch 'origin/master' into core

Conflicts:
	headless/src/main/org/nlogo/lex/TokenMapper.scala
update benchmark dumps on core branch
Merge remote-tracking branch 'origin/core' into headless

Conflicts:
	build.sbt
doc typo
Using custom build of release plugin, to support building from a branch
Merge branch 'multi-project' of github.com:Netflix/gradle-template
Merge branch 'master' into zk3.3.x
Merge pull request #152 from Randgalt/zk3.3.x

More Gradle updates
updated manifest file/Not sure if this is fully functional yet
Fixed some more loading the times issues/Made Vannum step by whole numbers instead of anything
Moved Create Table out of loop
Exchange encrypted JSON, not Python data.
Fix variable name.
[#44] add example doc for line chart title and dot control
[#44] implement line chart title update logic
[#44] implement line chart title example and split volume from monthly move chart
[#44] implement ref line for both x,y axis on line chart
fine tuned volume chart height
improved test data on time axis
fixed inverted y axis problem
improved test cases for bar setting
add group based chart rendering doc
rename barGap() to gap()
[#issue 25] move grid line to background

 - moved grid line to background layer
 - improved grid line drawing logic to be more efficient
v0.8 release
Merge branch 'gh-pages' of github.com:NickQiZhu/dc.js into gh-pages
Merge branch 'gh-pages-dev' of github.com:NickQiZhu/dc.js into gh-pages
v0.8.1 release
added fft lib,io,misc

small fixes and added libs
@增加内置对象
@增加第三方库math
@修复array_iter垃圾回收时更新出错
@完善应用example/script_engine/draw 软件
Fixed circle, regenerated textureatlas
Fix: handle empty lists. (don't format)
added raw PWM control for the bed heater
* Entered from the keyboard to enter data set of books in the form
* <author> <name>, <Year> <Notes>. Print your entries in a table,
* sorting them in alphabetical order by author's name. Print a list
* of books published in 1970.
First commit
Added in team respawn stuff.
changing tile size to the standard 256,256 to work with cached layers
options::OnPageChange can be called too early with idUI unitialized

  crash if idUI == 0
  This patch ensure OnPageChange is only connected when everything in properly initialized
  class member id* renamed to m_page* and correcly initialized
Since OECoverGridViewCells are reused, make sure to nil out its image in case there's none. This fixes duplicate covers when adding a game that has no cover art and might fix other cover art issues described in #187.
Fixed exception that occurred when trying to import unsupported files directly.
Hides the System column in library list view if we are currently showing a system. Also, actually shows the system name. Fixes #262.
Adds -[OELibraryDatabase dump] and dump methods for OEDBSystem, OEDBGame and OEDBRom. Useful for debugging Core Data issues.
Merge branch 'master' of github.com:OpenEmu/OpenEmu
Removes unnecessary -[NSUserDefaults synchronize].
Bootstrap added.

I've added the developers version without examples and myeclipse is
having issues with it inside the project, but we can just ignore it.
openvix: build 378
BlockType block
better command to talk to retards
added extra cases to the clear formatting test
Merge remote-tracking branch 'origin/experimental' into experimental
alustuksia
tyhjä luokka
k
Changed version to 1.3 in plugin.yml
Implemented field layouts including explicit layout and aligned packing support
fullscreen -> no mode-line
zoom -> :zoom
new location of repo
Support for OAuth/Bearer authentication added
Only linear recursive
Engine guessing now works
re-enabled autentication on bands
changed member variable naming
Fixed a bug where isLocal was set to false when using local[K]
Log message which records RDD origin

This adds tracking to determine the "origin" of an RDD. Origin is defined by
the boundary between the user's code and the spark code, during an RDD's
instantiation. It is meant to help users understand where a Spark RDD is
coming from in their code.

This patch also logs origin data when stages are submitted to the scheduler.

Finally, it adds a new log message to fix an inconsitency in the way that
dependent stages (those missing parents) and independent stages (those
without) are logged during submission.
Changes based on Matei's comments
Fixing some whitespace issues
Changed the way tasks' dependency files are sent to workers so that
custom serializers or Kryo registrators can be loaded.
Merge pull request #225 from pwendell/dev

Log message which records RDD origin
Print and track user call sites in more places in Spark
Made disk store use multiple directories, deleted ShuffleManager
Made subdirs per local dir configurable, and reduced lock usage a bit
Renamed subdirs option
Logging tweaks
Don't create a Cache in SparkEnv because we don't use it
Allow controlling number of splits in distinct().
Use null as dummy value in distinct().
Merge pull request #227 from JoshRosen/fix/distinct_numsplits

Allow controlling number of splits in distinct().
Added mapPartitionsWithSplit to the programming guide.
Made BlockManager unmap memory-mapped files when necessary to reduce the
number of open files. Also optimized sending of disk-based blocks.
Merge branch 'dev' of github.com:mesos/spark into dev
Comment
Added a CoalescedRDD class for reducing the number of partitions in an RDD.
Fixed an off-by-one error when deciding if we should grow BitSets.
Minor fix for Windows 8
Added Passkit fluent api for apple
Added Code Signing Fixes #46
Fixes #42

Changed how the channel signaled to stop exception is raised.  Before it
would be thrown and uncaught by the PushServiceBase's Distributer()
task, now it is raised as a channel exception instead.
Bumped Version # for NuGet
NuGet Package Release
Update Giant Chasm text.
Add tests clarifying issue regarding `relativePath` vs. `relativeString`. closes #996
Update README to include third-party dependencies on LibComponentLogging, SOCKit, and iso8601parser
Update Ace to build 06.17.2012.
Update Jade to version 0.26.1.
Appended Line to Readme

Added a line to change the file, afterwards which I'll send a pull request to the master file in order to see if changes are propagated upwards correctly.
Basic statistics added
[fix] Mods don't see an edit option in mod panel
Mods can edit their own posts forever, if they are pinned
reversed sorting order for font select on /users/edit
commented out unused code
added pages for series
possibly unecessary tests
Re-creating stub.
TTL in progress
Testing map reduce via HBase on sqwdev.res and hboot.res
Fix compile little tired >.>
Quita la l�nea de inicio

Trafulla trapera. PERO SIRVE.
updated mirenviroment table struct
- Improved set editor variables.
Merge branch 'master' of github.com:Shougo/vimshell
Removed NETFX_CORE defines.
Use a regular queue and Monitor instead of using a blocking collection in the Engine.
Build docs from assemblies using docu.
Fix ondemand.

Reset ondemand state when we cancel ondemand closing.
Update TFC to v37
로딩바 테스트버전
로딩바 테스트버전
로딩바 수정
Merge branch 'master' of https://github.com/Soyoung0712/PBS.git
MainActivity buttons created
Week 8 presentations begin
Initial flights list with demo data
Fixed Javadoc, fixed warnings in StormWeather.
Merge remote-tracking branch 'origin/master'
removed some blank lines.
Added SignLoggerModule
Fixed stuff 
Fixed stuff
Fixed stuff + Added new listener
Finished SignLogger module. 
Merge pull request #8 from deadlybutter/master

Added SignLogger Module
return null for eventTitle if title is empty string
Added the error-message parameter to the flash message when an authError is triggered
non-static again
Formatting
non-static access to Repair class method
affichage des cartes
essai du merge
added emails
Merge branch 'master' of https://github.com/ThrosturX/Alpha
Updated Manual TOC
Updated dispatcher to use cando.
Removing update module: will be re-implemented in later versions
Adding compilation for tidelite linux version
fixed nil comparison issues for same() and equals() assertions
Default GraphAPI.FacebookError message and code arguments to none
Add test for failing get_application_access_token
Create a make task for producing test coverage reports
Don't facilitate for constructing arbitrary signed requests
Created an interface for the movement listener, to avoid it being an
abstract class.
adding !orderfor and !cancelfor
Namespace clean'ups...
add support for zip packaging

This extension will let you create a zip file with 'mvn package'
bump to version 0.0.3 rc on the master branch

prune some turds and bump to version 0.0.3 rc
zip the base directory also

To make grading easier, the zip file creates a base directory
tweaks packaging

This change adds gz and bz2 packaging format and remove directory as a
packaging format.
fix readme formatting

maybe this is easier to read?
RESTlet

(re) Integrate M. Buising's restlet support (note we still need to move
the version dependencies to the parent's pom)
bump to version 0.0.3 rc

Specify version 0.0.3 rc in the pom.xml files
README help

improvements to the format of the README file
README refers visitors to the wiki

This is better so that we don't change the README all the time.
add change log to README file

From now on when we do a release the README will include updates/change
log.  This way we can see different versions and how each version
improves.
Merge pull request #2 from pcwerk/master

Pulling 10/12/2012
Added compatibility NBTLoad in TileTank for transitioning from old worlds.
Updated imports with new forge package locations
Realigned old Vec3d class to new name Vec3
Removed invalid import of ITextureProvider
renamed addSlot to addSlotToContainer
Added converter to forge Orientation in Orientations and made adjustments for ISidedInventory
Added missing import of ISpecialInventory
Removed ITextureProvider implementations
Removed remaining usage of ITextureProvider
Changed all implementations of addCreativeItems to use getSubItems
Replaced getBlockEntity with createNewTileEntity
replaced blockActivated with onBlockActivated
replaced onBlockRemoval with breakBlock
changed onBlockPlaced to updateBlockMetadata
updated package path for ISpawnHandler
replaced MinecraftForgeClient.bindTexture with ForgeHooksClient.bindTexture
Forgeified texturebinding for pipeitems, changed getBoundingBoxFromPool to getBoundingBox, fixed Block.getHardness calls
removed imports of NetworkMod, changed getCollidingBoundingBoxes to addCollidingBlockToList
Moved configuration stuff to /config/buildcraft

Fixed lots of stuff for core and transport, broke other stuff to get it compiling
Minor cleanup and busywork on other modules.
Reduced packet handler confusion.
sent message 5.10pm
Few moar small fixes
cleaned up syles, moved footer scripts into an include
modified:   app/views/layouts/application.html.erb
Merge branch 'hotfix/yandex'
commiting lots of stuff
test: Add aggregate test 11, testing class functionality.
improved menu
fixed missing response object
renamed taskplanner
added some more base files
no running logic yet
extended taskplanner logic
Formbuilder now takes the view as first parameter in the constructor
added classname of the view for a better error handling
added richInput method to add WCM input elements
added missing alt tag
moved icon & add jscode to publisher
implemented openJs & closeJs in the publisher ( ob_* include for js )
some experiments with the validator
code cosmetics
extended taskplanner
changed handling of class attributes
Valid Structur now supports error counter, and has a response object as
attribute
added includeContentTemplate method, name says all
extended task planner
plan list erweitert
Making sure everything is the same as the master branch.
informe congregacional

Signed-off-by: Victor Gonzalez <vagonzal@vagonzal-laptop.(none)>
Added the official wiki and tutorial links.
Addded the identification manager class.

IDM lets you get new id's for entities in form of strings. It can be found in Irenic.IDM.

new Irenic.IDM({"signs": "abc"});

"signs" is an optional argument, because the IDM already has an internal string of signs it uses to generate id's.
Added AI to the feature list.
pre merge
fixed double trigger bug
views trigger transitionIn/Out events
pageNav before overhaul
cover animation update
using logo center
using menu height to center logo
Just wanted to test some stuff
[_] rollback in boundbox behaviour
Allow for :port after unix socket dir in uri
made definition viewing publicly linkable for now
wto, 1 maj 2012, 23:40:42 CEST
added logo/image
displaying vendor of mac when new host detected
Suppression de StationaryCamera
Changing large analysis to staging so that files are written intermitently, and adding a secondary plotting stage.  Also cleaned up various codes and debugged.
Updated activities db
update `nodetool ring' output
move topology tracking into TokenMetadata from the Snitch
(cherry picked from commit 243113b450f9e2203410e7fe450e7131dad1bb8c)
(cherry picked from commit fdfeb650108ff199c83ce069b2b7092a060999d4)
Fix cleanup not deleting index entries
patch by jbellis; reviewed by slebresne for CASSANDRA-4379
(cql3) allow updating column_alias types
patch by Pavel Yaskevich; reviewed by Sylvain Lebresne for CASSANDRA-4041
commitlog cleanup; fixes stderr for RecoveryManager2Test on Windows
Fix deletion in CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-4193
Fix overlapping sstables computation in leveled compaction

patch by slebresne; reviewed by jbellis for CASSANDRA-4321
Improve scrub and allow to run it offline

patch by slebresne; reviewed by jbellis for CASSANDRA-4321
Backport leveled integrity check from trunk
Fix typo in CQL3 documentation
Update version and NEWS for 1.1.2 release
Update changelog and news file
Add missing sstables for ScrubTest
update dependency for p/cassandra-1.1/4120/01_create_store_host_uuid to cassandra-1.1.2
Merge commit 'refs/top-bases/p/cassandra-1.1/4120/01_create_store_host_uuid' into p/cassandra-1.1/4120/01_create_store_host_uuid
Merge commit 'refs/top-bases/p/cassandra-1.1/4120/02_uuid_in_application_status' into p/cassandra-1.1/4120/02_uuid_in_application_status
Merge commit 'refs/top-bases/p/cassandra-1.1/4120/03_reference_node_by_hostid' into p/cassandra-1.1/4120/03_reference_node_by_hostid
Merge commit 'refs/top-bases/p/cassandra-1.1/4120/04_remove_node_by_hostid' into p/cassandra-1.1/4120/04_remove_node_by_hostid
Merge commit 'refs/top-bases/p/cassandra-1.1/3881/00_snitch_topology' into p/cassandra-1.1/3881/00_snitch_topology
Merge commit 'refs/top-bases/p/cassandra-1.1/3881/01_calc_natural_endpoints' into p/cassandra-1.1/3881/01_calc_natural_endpoints
avoid NPE by returning empty Collection, not null
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Fixed stuff with brian's advice, currently index errors
merged in fixes and iteration code
Remove build_order from Builder as now depreceated
Leave running of specs to opal-spec
closer to nice high-level interface to linear regression
using doubles() to simplify some graph algorithms
Made this function invokable without the GUI.
Fixed support for storeX Selenium 1 steps that come from user-extensions.js.
wrong value type in config

Change-Id: I1f2728b3319097e9e8b61fb9c40fabcc83ae58fe
search working, barely
basic errors log
internal rev 33: finish support for protobuf tx
perl/shared-hash
Fix: fixed #15
arrows
fix svg for freshly uploaded stage
Готово описание модели агента. Код на стадии разработки.
updated to GO 1
Fix the PyMethodDef sentinel.
reorganize assets/images
change default format to graphmlz
Adds support for multiple opencv_features messages
Adds cropped_image field to the detected object
Stores the correct cropped image in the database
Correctly updating the image protobuf to contain cropped images
Adds convenience method to compute features from byte array
Adds method for storing features for different objects (their cropped images)
Adds support for multiple features, when saving images (i.e. features for all detected objects
Adds correct params to slicequery.setRage
Sends the cropped image features for opencv queries
curve refactor
Fixed #10790 -- Refactored sql.Query.setup_joins()

This is a rather large refactoring. The "lookup traversal" code was
splitted out from the setup_joins. There is now names_to_path() method
which does the lookup traveling, the actual work of setup_joins() is
calling names_to_path() and then adding the joins found into the query.
kickstart_file.yml fixed again
Adding some interface elements and updated app icon
App icon and some GUI elements (rest of files)
Ultimas modificacoes no codigo e no arquivo .glade
Revert "Sin editor de comandos."

This reverts commit eca19e69c00d09283d8c0d51f9c3a850ad7ba370.
Fail gracefully when dm-validations isn't loaded.
Version bump to 0.1.6
Regenerate gemspec for version 0.1.6
Q4 corrected and A5 done
新增/admin，記session。無視人數上限，加退選不增減人數
退選隨mode變動regtype
admin登出，到admin登入
Instead of hardcoding the send_intro in, execute send_intro when socket_connected is fired
support for multiple hosts in config files, plus test
throws exception when null or non-existent host
logging to make development easier - may be removed
more possibly temporary logging
default server for route
there is a default to /govuk/ so exceptions are not thrown to this test
adding a test to clarify prefix and full route behaviour for me
the path parameter on the request is the routeId, variously called routeId, routePath, incoming_path, id and pathParameter. Beginning the change to calling them all routeId
changing routePath to routeId
changing incoming_path to route_id. Still TO DO: write migration script to change the field name in mongo
adding end-point to rename incoming_path to route_id - TODO query is not quite right as can only be run once.
removing code to find host as this will now be passed through as part of the route. Also removing test
renaming test harness to main host test harness in preparation for adding another host
renaming test harness to main host test harness in preparation for adding another host
making tests work with a prefix of /mainhost/
adding extra home
adding second host
2 tests failing - TestHarnessController problem and typo problem
fixing last two tests
adding tests for 'punching a hole'
Do not run the local mongo test from Nagios
disable some tests that do not work from nagios
New browse subsection switching code
Changed browse page identifying class name
Removes old search results filter js
Correct colours for subsection highlighting on browse page
Renamed search.js.erb to search.js
Merge branch 'master' into killthecruft
Filenames parsed correctly. Correct episode result retrieved.
Added test cases for reserveNames test
ps3: Fix autobuild breakage
Add Tabbed browsing to the gaia browser
Small UX modifications inline with spec referenced in #66
Address review issues from @benfrancis and @philikon
Merge pull request #1445 from daleharvey/tabbed-browsing

Add Tabbed browsing to the gaia browser
Cadastrar empresa
test
Test
nova empresa, cadastro, consulta, etc
cadastro de usuario
cadastro de usuario
fixed test_data and missing import
Tests to confirm we read field names liberally
Final requirement for #54. Shapetcl is strict about formatting of field names when creating fields, but intentionally permissive about reading existing field names.
Make sure ownership is set correctly for user's new ssh keys
Merge pull request #1490 from sfromm/issue1484

Make sure ownership is set correctly for user's new ssh keys
Standardizing the module
Merge pull request #674 from nix85/fix_facter_mod

Standardizing the module
add errorfilter
move the domain classes to domain packages.
domain -> model
Added Windows builder batch and server running batch
cleanup. remove hashed out code in quickview base
intial dimensions of objs quick view increased
objects quick view tuning. home key and left arrows back focus up to filter entry
Add support for enumerator content assist
Merge pull request #65 from mballance-sf/master

Fix for #3452774
A few updates to ensure that enum types declared within a class scope
are discovered
Changelog updates
Merge pull request #64 from apaiva/objs_quick_view_tuning

Objs quick view tuning
Merge pull request #66 from mballance-sf/master

Enum content-assist updates
Update for 0.9.3 release
grubby: Allow using glib functions, avoid popt dependency

When defining GRUBBY_USE_GLIB, function sdupprintf() will be redefined
to use g_strdup_printf() instead. Also, uses of poptParseArgvString()
are replaced to corresponding calls to g_shell_parse_argv(), thus
completely avoding the libpopt dependency when both GRUBBY_USE_GLIB
and GRUBBY_AS_LIBRARY.
ostadmin: Add the OtAdminBootloader class

The OtAdminBootloader class defines a singleton which can be used
to inspect and modify the configuration of boot loaders installed
in the system. So far, it can do the following:

* Probing which boot loaders are available.
* Checking whether a particular entry is defined.
* Adding new entries to the boot loaders.
ostadmin: Use OtAdminBootloader instead of grubby

Instead of spawning grubby, use OtAdminBootloader to check and add entries
to the bootloader configuration file.
ostadmin: Remove unused grep_literal() function

Now that OtAdminBootloader is used, it is no longer needed for the
implementation of the "deploy" command to grep the Grub configuration
file, ot_admin_bootloader_has_entry() is used instead.
ostadmin: Function to free Grubby config structs

Unfortunately grubby.c does not include a function to free a
struct grubConfig, so define one, plus the ot_lgrubcfg macro
to conveniently free those structures when they go out of
scope.
ostadmin: Use access(2) to check for config existence
ostadmin: Canonicalize paths for addNewKernel()

Kernel and initrd paths have to be full canonicalized paths to pass them to
addNewKernel(). For sanity, it is also checked that the full paths are
inside the boot prefix directory.
error tests for route action spec
Polishing.
Fixed search form generated for Tapestry.
Updated basic-project requirements.
Add deliberately failing test to kickoff work on this patch
Merge master into 132
Move migration steps to their own package, create step 24
Added sequence builder to migration framework
Added a few more data points
Wired in sequence upgrade
Wire in domain config version to etag for diffs query
Added HTTP auth for checking etags
Merge master into 132
Upgrade release notes
Initial work on restructuring inventory upload form.
Inventory upload view works off one endpoint; add pair/endpoint selects.

Instead of letting the inventory panel know about selecting from a list
of endpoints, let the inventory panel view be linked only to a single
endpoint.

This allows us to add multiple inventory panels based off a pair
selection dropdown or an endpoint selection dropdown.
Clear all the panels before attempting anything else.
Prevent further execution if we've got empty selects.
More space for the two inventory panel selects and labels.
Add endpoint name to inventory upload template.
Switch upstream/downstream <div>s and include that info in the heading.
Center <select>s.
Use Select2 on inventory upload pair and endpoint lists.
Hide local variables inside IIFE.
commit by genmymodel from www.genmymodel.com: v20121205_175116
tree albums implementation

Adding parameter &checkForRequestAlbumVar to change parameter &parent
when you want to show child albums of current album.
[Dns] Handle timeouts in Executor
Refactor impl writing code
Update version, manifest dependencies