labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'master' of https://github.com/AlphaHo/training into hshcuai
Signed-off-by: Lummqxyx <tzjzlzming@hotmail.com>
Merge branch 'master' of https://github.com/AlphaHo/training.git into Ming_MS
提交数据库设计说明书
Signed-off-by: zhansf <929707351@qq.com>
完善数据库——终版
Signed-off-by: zhansf <929707351@qq.com>
修改用例图、E-R图
Signed-off-by: zhansf <929707351@qq.com>
Signed-off-by: liupan2000 <912196781@qq.com>
Merge branch 'HEAD' of https://github.com/AlphaHo/training into hshcuai
工作日志

Signed-off-by: hshucai <hshucai@163.com>
Signed-off-by: liupan2000 <912196781@qq.com>
完善需求文档的登录、添加用户功能需求
Signed-off-by: zhansf <929707351@qq.com>
6-8工作日志
Signed-off-by: zhansf <929707351@qq.com>
Signed-off-by: Lummqxyx <tzjzlzming@hotmail.com>需求分析说明书修改版本
工作日志
Signed-off-by: zklscut <taitoubiyan1@gmail.com>
Signed-off-by: Lummqxyx <tzjzlzming@hotmail.com>6月8日个人日志
Signed-off-by: Lummqxyx <tzjzlzming@hotmail.com>
Merge branch 'Ming_MS' of https://github.com/AlphaHo/training.git
Merge branch 'hshcuai' of https://github.com/AlphaHo/training.git
Merge branch 'liupan' of https://github.com/AlphaHo/training.git
Merge branch 'zhangkl' of https://github.com/AlphaHo/training.git
Signed-off-by: zklscut <taitoubiyan1@gmail.com>
修改目录
Diary added
Signed-off-by: zhugino <zhugino@gmail.com>
Merge branch 'zhangkl' of https://github.com/AlphaHo/training.git
convention added in the controllers and models
Use strtr to transform pattern into sentence
Add possibility to define multiple words of the same type (failing in certain cases for now)
first commit
Merge branch 'master' of github.com:AndroidJB/dalvik
Update default values for known_stores config.

Updates the default value for the 'known_stores' config
variable to include the full list of storage classes
supported in Glance.

Also, removes the known_stores config section from the
example config file since it is arguably an advanced config
that won't get used by most users. Removing this config avoids
the overhead of maintaining internal class names in config files.

Fixes LP Bug #1008698.

Change-Id: I0117376aa4de3103410ecb1a36df6998fcd0d5b5
Merge "Update default values for known_stores config."
finish php template; add posts function
add template for creating template pages
add timezone set to template class
post filename with hypens replace with spaces
tweak formatting on h2
[Feture] 增加append, appendTo的详细demo
Merge pull request #14 from linlingyu/dev

[Feture] 增加append, appendTo的详细demo
Implemented VertexConnectivity algorithm and corresponding unit tests. Most probably fixed the Result class Unrestricted Union bug (needs to run valgrind to confirm). Enhanced controller's unit test.
another clearart / logo fix
removed empty includes
main menu label fix
Merge remote-tracking branch 'origin/master'
Better use of existing textures
Do stringcompare instead of substring
completly fixed it now
only vertical scrolling for bannerplex
glows for dialogsonginfo and dialogalbuminfo
spanish lang update
more typos
Merge remote-tracking branch 'origin/3.0.0-pre' into 3.0.0-pre
fixed nowplaying to top
Add MacPorts to CMake search path
Merge branch 'master' of https://github.com/tribal-tec/CMake
Disable shadowing warning gcc < 4.2
Merge branch 'master' of https://github.com/tribal-tec/CMake
Send the service so the pluggin can load other assemblies
Add a development mode

	Pluggin development needs the pluggin to be directly loaded so the running program may be stopped for inspection and modifications. This is controlled by a configuration switch in the Robust.ini
it's a give and take relationship
first commit
Merge branch 'master' of https://github.com/BrandG/SkillHunt
Initialization && Deinitialization Exported.
Откатил изменения unloved
some comments in settings template
Editeur ok en C++
Debut menus C++
fix problem where wrong type of cell inserted in circle demo
improved updates on app crash
work
back from work
add: TH2 prak3 aufg1.1 wertung2
Fix mesh glitches on MapBlock boundaries
Merge https://github.com/celeron55/minetest
BrickClickOnEditTextTest fix to work with ABS
imported WallpaperCostume in these classes
added test for negative number (turn right)
allow input of negative numbers
fixed bug
set max length for EditText
7.32C: update to robotium 3.3
first debug changes
issue fixed, added test
fixed test
added a test
Merge branch 'master' into deleteUnusedPictures
fixed crashing tests
reverted changes, refactored test
Merge branch 'master' into deleteUnusedPictures
changed header to match Project fields
Update README.md

Moved large parts of the description from code.google.com here.
Update README.md

Added all links from code.google.com to the readme.
Update README.md

Added GSoC 2012 logo.
Merge branch 'master' into deleteUnusedPictures
added test 
added code for updating project list
added tests for copy/setDescription
fixed spelling error
fix for the tests
code coverage change ?
bad #!
fixed command aliases in plugins/remember.py
rTorrent to rTorrent-PS, add dwb userscript
rm unnecessary NOLINT in aero/jit.h
ajustes para release 1
faltantes de dompdf
nuevos iconos para ventanas y menu
igualado con stage de cliente
limpieza
igualado con stage del cliente
solución problema de box en pantalla de llamdo
excluyo usuario screen de lista de usuarios
ad video demo
limpieza
limpieza
limpieza y muestra mensaje si usuario no tiene indicado el box
muestro id de usuario en lugar de doc_id
si usuario en sesión es screen cierro sesión
agregué estilo de celda para estado called
nuevos estilos de iconos para reportes
reporte de importaciones
ventana de Acerca de..
necesario para enviar mime type cuando solicitan los ad video
config de stage del cliente
Proper yum package name
add monthly open hour log email
remove cucumber load warning
bundle update
Adding starshaped3D + Ball3D + a test
Starshaped other files
Curvature issue fix for ball3D
warnings & indent
fixing conflict
added ropemacs and other python magic
testing

this is a test commit to my test repo
simplify parser and disallow double sign for float
Add boxes around components
criação do carregamento por javascript na página inicial
Load listeners before modules during startup.
neu: Aufgabe 3
+ dia
Do not import pexpect if not needed in the jmx check
All pid file logging is debug.
Stylize the not running messages.
Merge branch 'status'
Merge branch 'master' of github.com:DataDog/dd-agent
Rounds visible in magazine
Rounds visible in magazine
Visible bullets in mag
Merge branch 'master' of https://github.com/David20321/7DFPS
Correctly find the USB port - it's usbmodem* not usbserial*
Attempt to fix Add User in two ways: (1) fixing some words in the email message template, and (2) not logging out the current user once they submit the form to add a user.
More panels.
Merge branch 'master' of github.com:/DirkR/capturadio

* 'master' of github.com:/DirkR/capturadio:
  Add audio_file.length as '<itunes:duration />' in rss feed.
Repaired configuration tests.
absolute path aclient
test fix
ddd
categories can be edited and used to display on UI
FIX: Clarify show output
MODIFED name to fit inside box and took out CSS shadowing
Fixes strip controller in Pico factory setups
Merge branch '2.0' of github.com:Eigenlabs/EigenD into 2.0
ignore vim's netrwhist
ignore oh-my-zsh checkout
add wopr script
ticker in api, first part of functionality
Codes added to handle the socket 'connect' issue related to interupted system call.
Added condition to see the socket creation is success or not.
Merge branch 'master' of https://github.com/bohara/Collage
Merge cleanups
Attempted to make the staging world buttons do stuff
fixed #60 - items are now ALWAYS reset when restarting
some changes related to updating css rules names and a little other changes
Initial application created from GiddyUp template
Fetch from upstream
Removed commented lines at end of file. Added version to mongoid, 3.0.8 was causing issues
Re added deleted lines that shouldn't have been deleted
Merge pull request #5 from bradylove/master

Added version to mongoid
utf16le/be added
RESTlight: Initial commit

* Added license
* Added first implementation
* Added unit tests
colorize nicks in chats, fix bug with settings state
Compile OpenGL examples by default
lokalne konfigi w katalogach :D
more on trivial
Mudanças na visualização de projetos | tarefas | colaboradores
adicionado actions referentes a visualização de projetos para ADMIN GERAL e ADMIN FILIAL
Merge branch 'master' of https://github.com/Geovane/SGCSFarm

Conflicts:
	application/controllers/ProjetoController.php
	application/layouts/scripts/layout.phtml
	application/models/DbTable/Empresa.php
	application/views/scripts/projeto/detalhes.phtml
Remove test/system.
Namespace unit tests.
Move smoke test to Acceptance namespace in unit tests.
Update unit test bootstrap doc block.
Remove Test.php from unit test file names.

Also remove Test from class names where possible.
Organise specs better.
Add Kohana core into test/system.
Parse emotes in ClassyName, so emotes are never serialized
renamed _connect_cb in Websocket
moved _connect_cb to protocols
moved _sendRestart to protocols
moved disconnect into protocols
fixed wrong indentation in sendIQ
fixed some calls from protocols to the connection
moved _doDisconnect to protocols
moved _onDisconnectTimeout to protocols
created reqToData. gets stanzas out of requests
created emptyQueue. checks for remaining requests
moved _sendTerminate to Bosh
replaced ALL "if"s by protocol objects :)
Fixed comments posting and index
Wiped data base of task entries
Keyword order fix
lowered the logging level of two statements from info to debug.
In fact, the info function is used for error logging level so its name
is misleading
Merge pull request #2 from HappyCrow/less_verbose

lowered the logging level of two statements from info to debug.
Create index.php

Here comes the index.php
first commit
Merge branch 'master' of github.com:HenrYxZ/tarea3ds
Worked on culling code
Updated meta description
Changed the return result of GET /igrep/jobs from descending order to ascending order of the field submitted
Revised pagination
Used regular expression for host header redirection
Added class table-striped to the table of jobs
Upgraded validator node module from 0.4.12 to 0.4.13 and spdy node module from 1.3.4 to 1.3.5
add TotalView
Fix open empty BD if default BDfile no exist.
fix #90 variable name (confused $qry and $r)
Popup added for quick and fast presentational linking
Пример решения первой лабораторной работы
added parse, shell
break cache for tabs
graph.py: MetaDict: Added a convenience function for creating an OrderedDict of axistag keys and shape dimensions.
layerwidget: Avoid KeyError if mouse click does not fall on a list item.
Fixed Issue #24 : Add / Drop operations not intutive. Added LEft Navigation Menu for user-friendly and intuitive UI.
update resouce constructor
Converted the rails plugin into a rails engine + gem plugin.
finally things are working
FLUFF
OmniMap work.
Partially fixed critical bug in OmniMap.
Remove water resource
Modify method build_Commons_title

 - Rename method to match convention
 - Use other method to get title
Add methods retrieve_ARK and retrieve_title in OaiRecordHandling
Add unittests

  - for retrieve_ARK, retrieve_title and build_Commons_title
Fix license and requirements in setup script
arrumar imagens
README modif
No biggie
Introduced simple propagation of nullability on loading Java.

 #KT-2776 in progress
Improved algorithm, added simple tests with generic types.

 #KT-2776 in progress
Loading functions from superclasses before current to avoid heisenbug.

Added test with two supertypes.

 #KT-2776 in progress
Supported generic subclasses in submethods.

 #KT-2776 in progress
Supported propagating read-onliness.

 #KT-2776 in progress
Reverted modification in TypeTransformingVisitor in "Renamed & moved AllInjectorsGenerator".

It was not relevant to that commit: it was squashed accidentally during interactive rebasing.
Fixed loading variance from alternative signature.
Supported variance propagation.
Added tests with two superclasses.

 #KT-2776 in progress
Moved all code relevant to signatures propagation to separate class.

 #KT-2776 in progress
++Loading functions from superclasses before current to avoid heisenbug.
Minor. Various fixups after code review.
Minor. Better name for CollectionClassMapping class.
Minor. Renamed variables where 'projection kind' term should be used instead of 'variance'.
Cleanup in tests.
++Minor. Various fixups after code review.
Simplified calculateTypeArgumentsFromSuper and added samples in comments.
WIP
added jquery to the generated kdoc so we can start adding some nice effects and interactivity
thanks to the heads up from Franck, I can work around KT-1646 - refactored previous Filter code to reuse the AbstractIterator base class and implemented filter/filterNot/filterIsInstance lazily
Even more detailed error messages
Update hcmgr/Predicate.cpp

Predicate Comments
Get the less process to run through the optimiser
Updated devel
Added libraries
Added formalize
deleted redundant filees
made ah ma ghost faster
folder for http client added
Merge branch 'master' of https://github.com/Kazooya/dziennik
Exclude wrapping warning

Change-Id: I19703b22177a9bb6a254b7cdd1af08fba1f419f6
Create default range domains for Int/DoubleVectorProperties

If no IntRangeDomain or DoubleRangeDomain is required in the
XML description of a proxy, it is treated as being unbounded.
This matches the behavior of previous ParaView versions.

Change-Id: Idf6170cbeff71b6bd21297884dda7a882faab05e
Fix determine version if git is missing

Ensure the regex is not applied if git executable
is missing.

Change-Id: Ieeab1b53107a88d57eeb813ec7d79909651ee153
Refactor logic in determine_version(...)

Clean up logic in determine_version(...) to make it
clear.

Change-Id: Ib39a50e7703132666bb20544c81fc7c45a27fcd6
Initial commit to support block name inside chart series

Change-Id: Iec2d7b3ea4aa315d210c30d5e24dc0adb545ba8d
Add support for full path naming for chart series in case of MultiBlock

Change-Id: I6352e96ff88af55a5c9e7b7b75bef9edbe74027c
Fix Path separator issue when multi-block are properly named

Change-Id: I9337c6a82bf351d7f0128fb042df7b060099a314
Revert "Exclude wrapping warning"

This reverts commit 6844d99d7892505966a06ac0598c7d8144239f59.

Change-Id: Idc00faf76681223b060a490413c594e27cff1f56
Fix warning in Wrapping command line

Remove deprecated argument concrete/abstract from the command line

Change-Id: I92103c90ef1e5a91a07f617a420309cc4e80e6aa
Merge VisitBridge contribution

Change-Id: I92c3c8ccf4649fa763dfb3817af30c91979450e4
Use pqTreeWidgetSelectionHelper for composite tree domains

This adds a pqTreeWidgetSelectionHelper for pqTreeWidget's for
composite tree domains. This allows the user to select multiple
selections on the tree widget.

Change-Id: I6a6ce11f9976cdbe52394049260f035769be1306
Update the VisItBridge SHA1 to get pixie timestep fix.

Change-Id: I889ade43421dceb275da8be8c9c21f3e71901024
Merge remote-tracking branch 'stage/integrate_visit_bridge_contribution' into pixie-timesteps

Change-Id: I8bd88b0e066ff085eaa9e42b835064938737fdb6
Check for NULL strings before in pqPropertyWidget's

This fixes a NULL-dereferencing bug in various pqPropertyWidget
derived classes in which the vtkSMDomain::GetXMLName() method
was returing a NULL string.

Now a new method named getXMLName(T *) will return a std::string
containing the XML name for the object which is always valid.

Change-Id: I4bf74278fb5e98407f44dbddd455eebd17affe6a
Disable scalar bar button for solid colors

This adds code to disable the "Show Scalar Bar" button in the
color editor widget when the representation is in solid color
mode.

Change-Id: Id5b999bb29dd5b1fb2dd2048832607454b7c4b67
Initial commit to support auto nightly binary testing within ParaView

Change-Id: Ibd54538996d77bed2d6a1f703b8392d722fbfbdc
Add missing file

Change-Id: I543cad7ce9718199e820acc096f53c4fe29b3300
Update NightlyBinary script for Linux

Change-Id: I81e14da189230969ed4be98a45a57ee2953dd085
Move forward visit bridge

Change-Id: Icef2f2a35ba836f9805f65ba4f92099110f3f475
Merge topic 'pixie-timesteps' into integrate_visit_bridge_contribution

Change-Id: Ibb4896430ee95f531d77ba1cd6959d3f032a1468
Updated demo page for index.html
単語同士の衝突判定を実装
Table.toString を実装
Table.rewriteLetters のバグを修正
Word の向きの定数を列挙型に
Install tests with all resources
Update botmodules/age.py

asdfasdf
删除项目中分类tab页
fixed the sample output in README
Second commit. A slew of features added.
Containerize breadcrumbs.
update/fix Framework package JS assets
add du paas.conf et maj fabfile
draw on image provided from Python
limits directions to only one route suggestion
clears directionresults from map. closes #82
DataStore.PageCache: we must have a bijection between queries
Update Dalvik Tweaks used in previous build that had not been pushed.
Add Vertival_Progress_Bar education project
Further attempts at minimising memory usage
Make header a grid with columns
Limit ignoring of ruby files

Just to make things easier in the future if I ever wanted to actually
use ruby files in this project.
README.md > README.markdown

I honestly prefer the longer extension, just because.
Commit markup files

I've had these commited previously, but ended up .gitignore-ing them
because they just felt like personal references and not something that
would actually contribute to the project. I've come to realise that not
every file I commit has to be directly used in the script. These files
will just be where we store a solid, readable version of the markup.
This will be mainly for reference, but I feel like it would be useful to
share them eg. if somebody wanted a bird's-eye view of the markup
without using dev tools, or if multiple people were working on the
script.

+ The dev-local files are just files I'm going to use to work on the
markup and css locally. I don't want to commit it because it's going to
contain link and script tags to local resources, and it really is only
relevant to me.
fixed bug
fixed bug
fixed bug
misc
template play port complete
style twitter button
fixed js loading bug for ranking
Declare file-scope objects or functions that do not need external linkage as static
Ereignislog

Einsehen des Ereignislogs möglich
Durchsuchen des Logs möglich
Neue Funktion 'searchEreignis' im ADB-Connector
{Model,Render}Parameter: allow to add a change listener
Editor: rename Slider to ParamSlider and implement attribute change
Added provider to some other models. Anthropometric (BSA) module. More on patient names and dates. All tests pass.
Added ToDo of possibly rare case where restart is skipped by 24 hours
Changed TextProp.
Merge pull request #13 from kuu/master

TextProp change.
fix some DNU
Added screenshot thumbnail
Signed-off-by:Bear <Bear@192.168.1.39>
Removed version string from mcontrol.sh
Added ionice option to rdiff-backup and tar
Added nice-level for server
Infotext for ionice
Added nice-level for backup (RUNBACKUP_NICE)
Added taskset option for server
Remove local var id_list in lottery_rand() and add global var ID_LIST
Use MC_SERVER_LANG only for the server start, not for everything else :)
Messing the code up more, async task stuff
Trivial : removing println that shouldn't be there
flex 2.5.37

Flex is provided by Apple, but some formula need a less broken
version than that one, especially Lion when building lilypond.
So let's add flex from sourceforge as a keg_only brew.

Closes #15986.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
bullet 2.81

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
cclive 0.7.10

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
csvprintf 1.0.2

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
dsocks 1.8

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
fex 2.0.0

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
innotop 1.9.0

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
libtorrent-rasterbar 0.16.5

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
primesieve 4.0

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
s3backer 1.3.3

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
serf 1.1.1

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
squirrel 3.0.4

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
xdelta3 3.0.5

Closes #16135.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Merge branch 'master' of git://github.com/mxcl/homebrew into develop
add all files in new repo
tinyformat fixes
Adicao do atributo alt nas imagens dos apoiadores
Added games-strategy/magarena-bin-1.24.ebuild
Added games-strategy/magarena-bin-1.24 to package.mask
Changed corrupted files
lots =P
some fun with the engine
Add Makefile to libyuv
Added basic support for while statements and comparison operators.
#38 convert uploader from jquery to dojo
function that verifies if student is able to attend subject added in database
PluginDownloader: Use GitHub's APIv3.
AutoMode & Unix: Update l10n-fr.
Fixed resetbutton (more testing might be needed)
Fixed bad require once
Added surveys for feedback in two versions: for /en/ and /pl/
Issue 221: client.getACL().forPath("/") throws a NullPointerException, because the Zookeeper
API expects a Stat, but GetACLBuilderImpl initializes responseStat to null.
Issue 222: Counter and log messages reversed in RetryLoop.takeException().
Issue 220: When creating a ServiceCacheImpl, a PathChildrenCache is created. The cache loads all existing services,
but because preloading does not create events, ServiceCacheImpl never notices this. ServiceCacheImpl.getInstances()
will return an empty list.
Grouped all level colliders into game object called WallsFloors
BORDEL
Merge branch 'master' of github.com:Redspikers/robSV

Conflicts:
	doc/Pin.odt
	src/Arm.cpp
	src/Arm.h
	src/Definition.h
	src/Memory.cpp
	src/Motor.cpp
	src/Motor.h
	src/Pin.h
	src/Recognition.cpp
	src/Recognition.h
	src/Robot.cpp
	src/Robot.h
	src/Sensor.cpp
	src/SensorColor.cpp
	src/Timer.cpp
	src/Timer.h
	src/main.cpp
Removed Elv Default button on S&L Install page.
Updated ToDo.txt

Signed-off-by: Repooc <repooc@tukui.org>
Test development for spending report. New participation csv report.
Added Sprint #02.doc
added Database.java unfinshed verison
Added databasetables, 6 tables totalt
Added 4 tables to database
Refactored Database.java
Added 2 tables to database
Added method  onUpgrade
Added simple version of database design
Refactor of Database.java
Added INSERT queries for default data in tables MuscleGroups and Sports. Also added queries to DROP all tables in onUpgrade()
Added method comments and INSERT queries for default data.
Added DbHelper.java and SQLView.java, and button to create database
Added menu:activity_sqlview, added menu:activity_database.xml, added values:strings.xml
Worked on Database implementation and Database I/O
Fixed the INSERT queries
Added Database design.xls
Made small changes to Database.java to make getData() work. ExerciseTypeId was misspelled.
Updated Database design.xls and removed unnecessary columns.
Added database access methods to Database.java
Updated Database design.xls
Fix contribution page links in documentation.
Contrib docs: Remove pointless staging branch info.
Fix typo in Github page table of contents.
Contrib docs: add section stub about pull requests.
Docs: Finish section on pull request guidelines.
Added profile timers

Track the running time of a function
Profiler::time(function(){});
Profiler::time(function(){}, 'name');

Track a stopwatch style timer throughout your app
Profiler::tick('name');
Profiler::tick('name', function($timer){});
Merge pull request #1109 from JesseObrien/feature/profiler-timers

Added profile timers
Added ## Laravel 3.2.5, and changed 'Upgrading From ...' to <h3>
Signed-off-by:Hirohisa Kawase <hiro.soft@gmail.com>
Added Danish translations to pagination and validation
reimplement locale uri slugs.
Docu on how to ensure foreign() works

tons of people are doing it wrong every day - this should fix it or at
least can be used as reference.
Revert "Docu on how to ensure foreign() works"

This reverts commit b92f5bc854267fedf918f1923a4b7d2d1192bfba.
Docu on how to ensure foreign() works

tons of people are doing it wrong every day - this should fix it or at
least can be used as reference.
Merge pull request #1127 from tobsn/patch-13

Docu on how to ensure foreign() works
Merge pull request #1119 from thomiweb/master

Danish translation of pagination and validation
added unsigned() description

was missing…
dann typo

i had one job…
Merge pull request #1128 from tobsn/patch-14

added unsigned() description
Merge pull request #1113 from HiroKws/markdown-fix/doc-change

Added ## Laravel 3.2.5, and changed 'Upgrading From ...' to <h3>
Merge pull request #1100 from franzliedke/patch-36

[Docs] Pull request guidelines
Incremental commit.
Add words to vim spell file.
Added png, ppt and word metadata tables.
Added jpg and pdf metadata tables.
Updated version of maven pluggin used to build webstart package
beimasba BE2 Scripte:

Anpassung fuer Traeger 19 ( UMG-case )
The last grep is supposed to be a -v, not a -o
Test tiles in home page;
Update
....
Ultimos cambios (No funciona)
Baraja y Mazo Acabados.
Cambiado método equals() de la clase Barometro
Acabados Ejercicios 1-5
Updated to version 1.0
Update version
Merge pull request #2 from kenrick/master
- Improved for date behavior.
Rounded corners for IE7/8.
Merge branch 'master' of github.com:Shridhad/igoogle
Issue about "Illegal Invocation" closed
Mention some new stuff in the TODO list
Temporarily hack around slow download times. New accessor stuff should obviate that mess.
Updated manual

added a paragraph about foreign words
Fixes and Touches

About to commence MediaQueries
Fixing syntax
Adding status image help pages
Improve EleaphRpc procedure name conversation for protocol
Fix multi message handling bug in IEleaph
Improve message handling by replace recursive handling with while loop
Improve Server login process by sending a contact list packet in every case (not only if user has contacts in his list!)
Make Contact list and Userdata Global available
Move Contact list and Userdata protocol-handling-logic from Mainwindow to LoginForm, and construct Mainwindow only after all needed data was received
Adapt MainWindow to new Data Handling Philosophy
Maven strikes again...lol

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Better gyro fragment shader
removed properities
SCUBA2: write a bad bolometer list to a flag file

In an attempt to speed up bad bolometer masking in the MCE, the QL
pipeline can write out a list of the bad bolometers as derived by the
most recent flatfield or noise measurement.

The text file is written in ORAC_DATA_OUT with the name
.sYYYYMMDD.badbol.

A flag file is only written by the QL pipeline
SCUBA2: write out a list of bad bolometers

Use the flatfield or noise data to derive a list of bad bolometers
from SETUPs.
Some values polishing
Sliced Notes on index page and appended ...
Finished the GPU stuff
Modify for loop for circle creation to be easier to read.
Calculate where circles touch.
[641] Analyzer: fix BarWidget alarm status loading
Add make install step
Update Code/print errors.h
directory rename and seems there's some problem free user-mode pages.
Confirm Purchase Activityyn mitä on ostettu ja saldon korjailua
ConfirmPurchaseen isompia tekstikokoja
Textwindow.otui update for scrollbars
Implement cleanup function evhtp_free.
Remove useless line.
Wrote a display function to render TPLValues in a friendly way. This lets me use the Show instance for other stuff if I like.
Completely rewrote the basic guide and fixed a bug in control.tpl.
Updated the readme file.
Fix 4 major bugs
added ubuntu 12 specific instructions regarding gtest compilation
Fixed a few MAJOR bugs.  Added some physics stuff.
Add Andrey's algo to index.php
mapserver: add airspace mapfile and airspace table for mapserver

Next commits will need those things...
mapserver: add fastcgi wrapper script for mapserver

To be used on the production server. Read next commit message for more
information on this.
mapserver: include mapproxy as tg controller to serve cached maps

If you want to run the mapserver locally without having to use it
via http from some web server (which is needed to run it as fastcgi),
change the "caches:" section in assets/mapproxy/mapproxy.yaml and point
the sources to [airspace_mapserver_bin]. This will run the mapserver
cgi-script from the location given in the "sources:" section.
mapserver: add script to import airspace files
public.js.map: use local mapserver for airspace map
style.css: Allow tooltips on dropdowns
clubs: Added optional email field for create_pilot URL
model/auth: Added lower case unique email_address index
Fehler bei der rücktransformation
Adding Nicholson School brochure
Splitted max in max (ws) and bigmax
Added Uberdust Library and first example, called airconditioner
Fixed a bug in code used to capture events which was causing out of bounds exceptions in the paint test
Fixed a focus problem so that the MUIS document can receive keyboard events
Fixed a delay in painting even when the now parameter in MuisElement.repaint was true
list => dict change in userlist
Merge branch 'master' of https://github.com/Uriziel/syncplay
Don't display empty message
Exception fix.
st-flash: Honor size, if given
Dump living threads in vm + fix thread stack dump
Version bump
Invoke GC before dumping
Defined CURL_BIN value different on each architecture.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Defined APP_CURRENT_VERSION value in defaults.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Defined version checking ability for definitions. More in details.

* Defined checking current version specific for each definition.
* No more time measurement for each run().
* Defined check_current() and check_current_by_definition() to invoke comparison of version if APP_CURRENT_VERSION is defined (it contains version string from remote site)

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Defined APP_CURRENT_VERSION check for Node, Postgresql, Redis and Ruby definitons.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Updated Redis definition to version 2.6.7.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
More verbose sofin-install.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Switched to Python 3 for Mercurial. Added explicit libs required for Mercurial.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Switched to Python 3 in Mercurial definition.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Sha for Tig.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Simplified lock check. Additional unnecessary lock check removed.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Want a 25% partest speedup?*

... well then, don't compile twice!

Explanation:
The compilation process in partest happens in 3 stages:
 - scala + java files, all fed to scalac (so the java signatures are
   loaded and the scala bytecode is generated)
 - java files, fed to javac (so the java bytecode is generated)
 - scala files, fed to scalac (so the scala bytecode correctly links
   to the javac-generated bytecode)

While this mechanism is great to have, for simple 1-file scala tests
it's overkill by compiling scala files twice. So I adjusted the compile
procedure to only run the first step if java files are empty, leading
to a 25% partest speedup.*

Also included Seth Tisue's comment about the tests that require the
three-step compilation.

* as measured on test.scaladoc
Remove Old Voodoo
Fist Commit Voodoo beta
Added htaccess to files to ignore when testing
Make __destruct exeute the renderView() instead of finalize()
Remove the finalize() which is called by parent::__destruct(), and add a renderView() method to display the view
Fixed minor bugs in do-voodoo.php to run a single controller as API. Remove the init() and finalize() from files template. Added an 'api' controller in the application.json
Version bump 0.2
Added the absolute github link of the refering branch.
Allow assign to accept dot notation key and clean up
Fix constant name FORMAT_TEXT & update docs
Bump Version 0.3
Fix $this->actionView and make use of setActionView()
Bump to 0.4
Upgrade to VoodOrm 0.4
Version 0.4.1
Fixed namespace name
Voodoo set to PHP 5.4. No backward compatible.
Only load __called file once
Refactor controller and removed setActionName. Left open the reflectionClass for future feature
Fix leading slash in router URI
Added BasicScrobbling
Reworked server startup, using a newer scriptable cli version.
Corrected map for deck
moving to color-theme-tangotango, commit cec9d21df34e3fc73ec9cf37a4496505730e8573 from GitHub
moving ack configuration to search-tools.el
new pkgbuild: snmp simulator
[Test2]Service
Changes to make
layer adding updates
update backbone to 9.2
frame workspace rendering updated
frame/layer overhaul
mid edit
adding layers updated
continuing layers to other frames doesnt unrender it from the current frame
continue to linked sequence updated
frame reorder works again
new layers can be repositioned
multiple frames can be added
frames revamped
frame view cleaned out
frame view reorg
broken commit
sequences can be created
adding frames works again
sequence less updated
deleting sequences works pretty well
sequences draw in the correct lists now
Improved the Items API response (fix encoding problems, removed unused and repeated code, etc); bug fix on the Youtube parser
Merge branch 'master' of github.com:Zeega/Zeega-Core
Restored search API method wrongly removed with the latest merge
Fixed the collections playback; some layers are still missing
Make it compile (network)
corrected a wording in a step definition
updated to Ruby on Rails version 3.2.5
Added dataset greedy option
Year bubble view, zooming , filtering done.
Conflict resolved.Merge branch 'Beta_Dev_CR' of github.com:a2omobile/Client into Beta_Dev_CR

Conflicts:
	A2OHubBeta/A2OHubBeta/Views/TimeLineView.m
DeclUse Added Choices + BugFixen TypeDefs
commit to the Sandbox!
this time, it will commit
Merge branch 'master' of github.com:abpatrza/Sandbox
small refactoring of as_json method

with this refactor root has always one assignment
Fixed graph widget
Merge remote-tracking branch 'origin/cmw-integration' into cmw-integration
Fix issues #6 and #7.
Devise installed and generated
removed random test files
Add new datetime attributes
adding appel.id to flash messages
fixing showing date_appel for datepicker, adding mask
symptome requires unique name
adding ref to colorscheme designer pattern to test
adding append to imc, fixing atcds fam size
moving SA field after grs dates
small typo
changing to vertical form, fixing css, labels
clean up dossiers css
disabling imc input
disabling imc input
fixes for fr locale
simpify layout
new colors, adjusting layout, changing navbar search
adding import fonts, don't submit if search empty
adding scroll to autocomplete
adding combobox autocomplete, fixing input-append button css
dividing form-horizontal vertical stuff in css
subclass for autocomplete scroll, bootstrap looks autocomplete
disabling submit with 'enter' for text inputs only
force upcase for codedossier search form
adding hr before commentary
Merge branch 'stacked-forms'

Conflicts:
	app/views/dossiers/_infos.html.haml
basic user login stuff
Change sublime alias
init jso parser
rename index-async.html to index.html
add a link in the readme
add style to search btn in jso parser
PF-14: Created member state. Added current logged user to member domain class.
Merge remote-tracking branch 'origin/develop' into develop
added specs for checking comments after merging and for the content controller
Fixed two leaks regarding gradients on the svg renderer
parser: url
Added rvmrc file
more efficient implementation of length
bump version
enter password twice when registering
pidgin 2.10.6-1 x86_64 by khvalera
qt4: bump to 4.8.3
Merge branch 'master' of github.com:aix27249/abuilds
use Path module for existsSync and added AMLNOTIFIER to defines
some additional relationships
инициалы
Продолжаем добавлять красивости и удобности
self_score sort by score for grouped
mail for admins about fired workers
More implementation.
V4 tests.
Vector4 api tests.
Added aditional field types.
Trim using any delimiter.
Made try-excepts less terrible -- we specifically want to check for DoesNotExist errors
oh god the commit log
Simple content provider implementation
Test "connect event" is added and passed.
Update README.md

Update description in README file
Log entry fix
Working on the main.js and started with the cloudant
Removed linkedin package from this PR

Login services should be defined from within their packages

Corresponding login service assets (images and css should be in their respective packages not inside of accounts-ui-unstyled)

Conflicts:
	packages/accounts-linkedin/linkedin_client.js
	packages/accounts-linkedin/package.js
	packages/accounts-ui-unstyled/login_buttons.js
	packages/accounts-ui-unstyled/login_buttons_images.css
gnuplot: Fix misspelling of "Cairo"

Closes #16766.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
ruby-build 20121227

* Added a definition for Ruby 1.9.3-p362
* Added a definition for Ruby 1.8.7-p371
* Moved the default ruby-build mirror from GitHub Downloads to Amazon
  CloudFront.

Closes #16765.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
global: Update to 6.2.7

Also removed option "without-rebuilding-php-parser". Option no longer
needed as GNU Global is now distributed with the rebuild PHP parser by
default.

Closes #16759.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
ruby: Update to 1.9.3-p362

Closes #16757.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
Merge branch 'master' of https://github.com/mxcl/homebrew
utils: replace shell `which` with native code

Originally written for tigerbrew, but useful enough for core.
Replaces the shelled-out which in utils.rb with a native-ruby
equivalent, which is moderately faster.

Closes #16659.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
vice 2.4
discount and markdown conflict with each other
ttytter 2.1.00
shocco: move hard markdown dep to Requirement

schocco requires a `markdown` command. The previous version of the formula
checked for the markdown formula. However, there's an edge case involved.
The discount formula installs a command `markdown` which can also satisfy
shocco's requirement. (And I would add that discount's implementation of
the `markdown` command is far superior to markdown's, though I grant that's
debatable.)

This update checks for any `markdown`-providing install, and if one is not
found tells the user what options are available.

I think this is better than just installing the markdown formula. First, if
discount is already installed, then when `brew` tries to install markdown,
the linking stage will fail. Although the shocco install as a whole will go
through, the failure message about linking markdown is likely to confuse
the user.  Also, if discount is already installed, that problably means the
user doesn't want the markdown formula. Finally, this way of handling
things is more easily extended if other formulas become available which
provide a valid `markdown` command.

Closes #16740.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Merge branch 'master' of https://github.com/mxcl/homebrew
xvid: use a mirror

Fixes #16752.
Replace sceaga/homebrew with mistydemeo/tigerbrew

@sceaga has discontinued his homebrew fork, so tigerbrew is now PPC/
Tiger users' best bet.
Merge branch 'master' of https://github.com/mxcl/homebrew
ume 0.147

Closes #16771.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Merge branch 'master' of https://github.com/mxcl/homebrew
basex 7.5

Closes #16709.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
Respect BROWSER environment variable
Rakudo Star 2012.12

Closes #16778.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
cassandra 1.1.8

Also added devel version.

Closes #16775.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>
update from main web
pull roman
get list from server
get list from server
get list from server
fixed some issues
fix some issues
bugfix with the time constraint validations
simplifying code with blank? method
making controller template methods protected so it's clear that they don't map to actions
using stricter timeliness parser so that dates won't be ambiguously parsed
moving the content change request to the new architecture
deleting dead code
fixing merge bug
moving the new user request to the new architecture
deleting dead code
Merge pull request #12 from alphagov/moving_forms_to_new_architecture_part1

Moving forms to new architecture part1
Corrigiendo errores del mantenimiento de habitaciones
Librera del fichero17
Add Python 2.6, 3.0, 3.1, and 3.3 to versions to test.
Test fix for Python 2.6.
Fix tests on Python 2.6 and Python 3.0.
Merge pull request #31 from amorilia/feature/support-more-python-versions

Support more python versions.
02 - Added extra test units and appropriate functions
Changed to comply with -Wall.
Cleanup on at_exit hook
added cron tab to keep glance images updated
make tmux console modular
ScanSpec DistictColumn methods added
New tests added
Getting started GlobalSuppressions.cs added
This change fixes a build warning and font issue.

We use Ariel because the old font is no longer supported on the system.
Changed splashscreen to splashScreens in bar descriptor.

Change-Id: I04eeb59e6a33a9b6bc797e29f8be4287a10b712a
add empty bot
Merge remote-tracking branch 'origin/master'
cleaned up accounts section
changed dryrun of bootstrap to actual copy command.
Пофиксил косяк с выравныванием контекстного окна
Доделано сохранение состояния в инвентаре
1) Сделал статистику персонажа
2) Поправил конструткор
Доделан экран статистики
Начал делать экран достижений
OER-550authoring: Removing skip-to-content-link from the deadManBlur for the top user menu.
main part hop-story
Disallow counters in collection

patch by slebresne; reviewed by jbellis for CASSANDRA-5082
Merge branch 'cassandra-1.2.0' into cassandra-1.2

Conflicts:
	CHANGES.txt
ZOOKEEPER-1584. Adding mvn-install target for deploying the zookeeper artifacts to .m2 repository (Ashish Singh via phunt)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1422167 13f79535-47bb-0310-9956-ffa450edef68
/ ‘texto.txt’
Creación de la solución

Creación de la solución en la rama desarrollo
added home page screen dump
Merge branch 'master' of github.com:appcara/sugarcrm
add fariy dust to readme
TEST
i have add new file in this branche
c'est TEST2
Merge remote-tracking branch 'origin/TEST1' into TEST2

Conflicts:
	README.md
	test.txt
Merge branch 'TEST2' into TEST1
Edited for timeoffset
Use YAML syntax highlighting in the readme file.
Merge pull request #3 from ming13/readme-syntax-highlighting

Use YAML syntax highlighting in the readme file
A bit of a cleanup in Command#check_access
Updating.

  anansi
  blaze-html
  cmdargs
  derive
  ghc-mod
  hlint
  monad-control
  persistent-template

Signed-off-by: Magnus Therning <magnus@therning.org>
每天23点将PROGRESS的任务转入READY
Define the procreate relation.
Add the edges between couples that had children together.
children
Compute and render as pretty as possible the relation between couples
Fix queue defer func call typo
DD: video application base.
ADD: ignoring PNG files.
ADD: django-extensions application & dependences declaration for development environment.
update documentation

Signed-off-by: Andrea Righi <andrea@betterlinux.com>
changed local to svn in omset
Enabled more aero effects.
Update breadcrumb with new style using text-overflow ellipsis
Normalized EAD import/export of revision history.
fixed reattach-to-user-namespace for non mac machines
format json files
extracted some hard coded scripts
info how to start atmux with gnome terminal
ignore mutt for now
screen splitting keybindings
ignore case in pascal file name and load additional settings if any
Merge branch 'master' of github.com:arturasl/configs
Added CMake exclusions
The processing instruction target matching "[xX][mM][lL]" is not allowed.
Updated Chinese (zh_CN) translation (provided by sunnavy)
Make MessageListHandler a real Handler that uses Android's message queue
Moved methods modifying the message list to MessageListAdapter
Don't use MessageListHandler when calling from the UI thread
Rewrote code accessing mAdapter.messages from outside MessageListAdapter
Made sure the message list is only modified from the UI thread
Code cleanup
Properly closing InputStreams to avoid StrictMode warnings
Update Italian translation (Issue 4504)
Optimized searching for a message in the message list
Add null check before attempting to do math on the date.
Add references and in-reply-to for forwarded messages.
Close input stream after reading to fix strict mode warning.
Remove the try-finally stream close.  Add comment as to why this pattern doesn't work here.
Merge branch 'MessageListAdapter_cleanup'
More magic to work around BinaryTempFileBodyInputStream
Fixed Issue 4543: Msg UnRead after "Download Complete" pressed
Fixes 4517: Junk special folder not autoconfigured (rfc6154 implementation was incomplete)
re Bernhard's Issue 4543 fix: only set as read if account.isMarkMessageAsReadOnView()
Use lowercase filenames
add authenticated div
Merge branch 'master', remote-tracking branch 'origin' into unauth
toggle between auth/unauthed views
make rdio logo image a link to rdio.com
Merge branch 'master' into unauth

Conflicts:
	css/showdio.css
	js/showdio.js
	templates/main.html
Added test for SuperLU and adapted the Makefile.am to support it
Added missing m4 file with the test for SuperLU
Merged latest changes from upstream branch
New function clone_wells()

Used to create a deep copy (clone) of an existing Wells object.

While here, add test case for common Wells object operations.
Added constuctor to WellManager which used Wells struct.
Clone wells object when constructing from existing.

This installs a measure of safety on the part of the interface in that
the caller is free to dispose of the wells object upon returning from
the WellsManager constructor.
Add debugging assertions to check input in several routines.
Link Boost.Filesystem explicitly where needed.

While libopmcore, following commit 37e14f, depends on (and references)
Boost.Filesystem (through the $(BOOST_FILESYSTEM_LIB) macro) this
indirect dependency is not sufficient to satisfy the requirements of
targets that use the indirect libraries directly.

Additional details at
   https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
Make opm-core compile with boost on my Debian system
Merge remote-tracking branch 'bard/link-boost-explicitly-where-needed' into superlu-support
This fixes the errors on Debian when linking the examples.
Adapted my changes to the changes Bard made, to make opm-core link on Debian.
Merge pull request #47 from bska/expand-well-treatment

Expand Well Treatment
Merge pull request #50 from bska/link-boost-explicitly-where-needed

Link Boost.Filesystem Explicitly Where Needed.
Removed DUNE artefacts.
Now uses AX_BLAS instead of ACX_BLAS.
Merge pull request #48 from blattms/superlu-support

Superlu support
Add info about building as a dune module.
Merge pull request #51 from atgeirr/master

Update README with info about building opm-core as a dune module

Thanks, it clarifies the build options. I can try to improve further on it if I find time. However, I am afraid contract work will consume me in the coming weeks.
Merge branch 'master' into reorder_tof
continuing no puppet
commit inicial do diretório de filmes.
now ignores folders
moves order of js
Freezing the promise once it's resolved
Archive::IE:right stripe
initial?
all
Merge https://github.com/axxxon/Bookstore
tmux solarized
use solarized tmux colors
Переименование переменной в Ohotmin-2012.pl
start of the scrumboard js framework for ui
社区公告插件
Added FC0012 tuner support
Added following devices: Peak, Ardata MyVision, MyGica/G-Tek, Lifeview, Prolectrix, Terratec Cinergy T (rev 1)
New OP25 Decoder GRC block
New Message Callback GRC block
Removed unneeded comments

Signed-off-by: Baki Goxhaj <banago@gmail.com>
mapka v3 + tank
dodana podstawowa walidacja w edycji usera
prace nad połączeniem profilu
Added gd
two couchbases, one comparison
Merge pull request #38 from basho/couchase-has-2-free-versions

two couchbases, one comparison
Corrected port number for riak 1.2
Merge branch 'master' of https://github.com/basho/basho_docs
Add init.d script for rhel/centos
Allow component to be assigned to several teams
Update DB schema to support multiple teams per component
fixxed slider controls